Correct conditional test.

[bertos.git] / bertos / kern / proc_p.h

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 9d61b53123b369010532a3ad1765d6d5f239d103..3316594eb1feb2beeee634264378637526f19e64 100644 (file)
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -40,10 +40,14 @@
 #ifndef KERN_PROC_P_H
 #define KERN_PROC_P_H
 
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
+#include "cfg/cfg_monitor.h"
+
 #include <cfg/compiler.h>
 
 #include <cpu/types.h>        /* for cpu_stack_t */
+#include <cpu/irq.h>          // IRQ_ASSERT_DISABLED()
 
 #include <struct/list.h>
 
@@ -104,34 +108,66 @@ extern REGISTER Process   *CurrentProcess;
 /**
  * Track ready processes.
  *
- * Access to this list must be protected with a proc_forbid() / proc_premit()
- * pair, or with SCHED_ATOMIC()
+ * Access to this list must be performed with interrupts disabled
  */
 extern REGISTER List     ProcReadyList;
 
 #if CONFIG_KERN_PRI
-       /**
-        * Enqueue a task in the ready list.
-        *
-        * Always use this macro to instert a process in the ready list, as its
-        * might vary to implement a different scheduling algorithms.
-        *
-        * \note This macro is *NOT* protected against the scheduler.  Access to
-        *       this list must be performed with interrupts disabled.
-        */
-       #define SCHED_ENQUEUE(proc)  do { \
-                       LIST_ASSERT_VALID(&ProcReadyList); \
-                       LIST_ENQUEUE(&ProcReadyList, &(proc)->link); \
-               } while (0)
-
-#else // !CONFIG_KERN_PRI
-
-       #define SCHED_ENQUEUE(proc)  do { \
-                       LIST_ASSERT_VALID(&ProcReadyList); \
-                       ADDTAIL(&ProcReadyList, &(proc)->link); \
-               } while (0)
-
-#endif // !CONFIG_KERN_PRI
+       #define SCHED_ENQUEUE_INTERNAL(proc) LIST_ENQUEUE(&ProcReadyList, &(proc)->link)
+#else
+       #define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+#endif
+
+/**
+ * Enqueue a process in the ready list.
+ *
+ * Always use this macro to instert a process in the ready list, as its
+ * might vary to implement a different scheduling algorithms.
+ *
+ * \note Access to the scheduler ready list must be performed with
+ *       interrupts disabled.
+ */
+#define SCHED_ENQUEUE(proc)  do { \
+               IRQ_ASSERT_DISABLED(); \
+               LIST_ASSERT_VALID(&ProcReadyList); \
+               SCHED_ENQUEUE_INTERNAL(proc); \
+       } while (0)
+
+#if CONFIG_KERN_PRI
+/**
+ * Changes the priority of an already enqueued process.
+ *
+ * Searches and removes the process from the ready list, then uses LIST_ENQUEUE(()
+ * to insert again to fix priority.
+ *
+ * No action is performed for processes that aren't in the ready list, eg. in semaphore queues.
+ *
+ * \note Performance could be improved with a different implementation of priority list.
+ */
+INLINE void SCHED_CHANGE_PRI(struct Process *proc)
+{
+       IRQ_ASSERT_DISABLED();
+       LIST_ASSERT_VALID(&ProcReadyList);
+       Node *n;
+       PriNode *pos = NULL;
+       FOREACH_NODE(n, &ProcReadyList)
+       {
+               if (n == &proc->link.link)
+               {
+                       pos = (PriNode *)n;
+                       break;
+               }
+       }
+
+       // only remove and enqueue again if process is already in the ready list
+       // otherwise leave it alone
+       if (pos)
+       {
+               REMOVE(&proc->link.link);
+               LIST_ENQUEUE(&ProcReadyList, &proc->link);
+       }
+}
+#endif //CONFIG_KERN_PRI
 
 /// Schedule another process *without* adding the current one to the ready list.
 void proc_switch(void);