X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.h;h=5c26465257f075b4ef71213095266f421e5396cd;hb=98cd348c9401ddbc14452941faa931118fc3984e;hp=a2a7b283e9d93c6622e523bc4e5ca3650d88b734;hpb=40c25a4b1d0f1c23478c2d681b74662de968f671;p=bertos.git

diff --git a/bertos/kern/proc.h b/bertos/kern/proc.h
index a2a7b283..5c264652 100644
--- a/bertos/kern/proc.h
+++ b/bertos/kern/proc.h
@@ -46,6 +46,7 @@
 #endif
 
 #include <cpu/types.h> // cpustack_t
+#include <cpu/frame.h> // CPU_SAVED_REGS_CNT
 
 /*
  * Forward declaration. The definition of struct Process is private to the
@@ -65,7 +66,6 @@ struct Process *proc_new_with_name(const char* name, void (*entry)(void), iptr_t
 
 void proc_exit(void);
 void proc_yield(void);
-#define proc_switch proc_yield /* OBSOLETE */
 
 int proc_testSetup(void);
 int proc_testRun(void);
@@ -77,6 +77,14 @@ void proc_rename(struct Process *proc, const char *name);
 const char *proc_name(struct Process *proc);
 const char *proc_currentName(void);
 
+#if CONFIG_KERN_PRI
+	void proc_setPri(struct Process *proc, int pri);
+#else
+	INLINE void proc_setPri(UNUSED_ARG(struct Process *,proc), UNUSED_ARG(int, pri))
+	{
+	}
+#endif
+
 /**
  * Disable preemptive task switching.
  *
@@ -87,6 +95,9 @@ const char *proc_currentName(void);
  * \note Calling functions that could sleep while task switching is disabled
  * is dangerous and unsupported.
  *
+ * \note calling proc_forbid() from within an interrupt is illegal and
+ * meaningless.
+ *
  * \note proc_permit() expands inline to 1-2 asm instructions, so it's a
  * very efficient locking primitive in simple but performance-critical
  * situations.  In all other cases, semaphores offer a more flexible and
@@ -97,12 +108,34 @@ const char *proc_currentName(void);
 INLINE void proc_forbid(void)
 {
 	#if CONFIG_KERN_PREEMPT
-		// No need to protect against interrupts here.
-		extern int preempt_forbid_cnt;
-		++preempt_forbid_cnt;
+		extern int _preempt_forbid_cnt;
+		/*
+		 * We don't need to protect the counter against other processes.
+		 * The reason why is a bit subtle.
+		 *
+		 * If a process gets here, preempt_forbid_cnt can be either 0,
+		 * or != 0.  In the latter case, preemption is already disabled
+		 * and no concurrency issues can occur.
+		 *
+		 * In the former case, we could be preempted just after reading the
+		 * value 0 from memory, and a concurrent process might, in fact,
+		 * bump the value of preempt_forbid_cnt under our nose!
+		 *
+		 * BUT: if this ever happens, then we won't get another chance to
+		 * run until the other process calls proc_permit() to re-enable
+		 * preemption.  At this point, the value of preempt_forbid_cnt
+		 * must be back to 0, and thus what we had originally read from
+		 * memory happens to be valid.
+		 *
+		 * No matter how hard you think about it, and how complicated you
+		 * make your scenario, the above holds true as long as
+		 * "preempt_forbid_cnt != 0" means that no task switching is
+		 * possible.
+		 */
+		++_preempt_forbid_cnt;
 
 		/*
-		 * Make sure preempt_forbid_cnt is flushed to memory so the
+		 * Make sure _preempt_forbid_cnt is flushed to memory so the
 		 * preemption softirq will see the correct value from now on.
 		 */
 		MEMORY_BARRIER;
@@ -123,14 +156,13 @@ INLINE void proc_permit(void)
 		 * flushed to memory before task switching is re-enabled.
 		 */
 		MEMORY_BARRIER;
-
+		extern int _preempt_forbid_cnt;
 		/* No need to protect against interrupts here. */
-		extern int preempt_forbid_cnt;
-		--preempt_forbid_cnt;
-		ASSERT(preempt_forbid_cnt >= 0);
+		ASSERT(_preempt_forbid_cnt != 0);
+		--_preempt_forbid_cnt;
 
 		/*
-		 * This ensures preempt_forbid_cnt is flushed to memory immediately
+		 * This ensures _preempt_forbid_cnt is flushed to memory immediately
 		 * so the preemption interrupt sees the correct value.
 		 */
 		MEMORY_BARRIER;
@@ -138,6 +170,20 @@ INLINE void proc_permit(void)
 	#endif
 }
 
+/**
+ * \return true if preemptive task switching is allowed.
+ * \note This accessor is needed because _preempt_forbid_cnt
+ *       must be absoultely private.
+ */
+INLINE bool proc_allowed(void)
+{
+	#if CONFIG_KERN_PREEMPT
+		extern int _preempt_forbid_cnt;
+		return (_preempt_forbid_cnt == 0);
+	#else
+		return true;
+	#endif
+}
 
 /**
  * Execute a block of \a CODE atomically with respect to task scheduling.
@@ -149,11 +195,11 @@ INLINE void proc_permit(void)
 		proc_permit(); \
 	} while(0)
 
-#ifndef CONFIG_PROC_DEFSTACKSIZE
+#ifndef CONFIG_KERN_MINSTACKSIZE
 
 	#if (ARCH & ARCH_EMUL)
 		/* We need a large stack because system libraries are bloated */
-		#define CONFIG_PROC_DEFSTACKSIZE  65536
+		#define CONFIG_KERN_MINSTACKSIZE  65536
 	#else
 		/**
 		 * Default stack size for each thread, in bytes.
@@ -174,7 +220,7 @@ INLINE void proc_permit(void)
 		 * required per process.  Use irqmanager to minimize stack
 		 * usage.
 		 */
-		#define CONFIG_PROC_DEFSTACKSIZE  \
+		#define CONFIG_KERN_MINSTACKSIZE  \
 		    (CPU_SAVED_REGS_CNT * 2 * sizeof(cpustack_t) \
 		    + 32 * sizeof(int))
 	#endif