Merge branch "preempt" in "trunk".

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

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 961f2473d7277d2d135086d3f7a3cc8828dcd13c..f1b5aa34805503296c4954ea248cf17186fecdb1 100644 (file)
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -41,7 +41,6 @@
 #define KERN_PROC_P_H
 
 #include "cfg/cfg_proc.h"
-#include "cfg/cfg_signal.h"
 #include "cfg/cfg_monitor.h"
 
 #include <cfg/compiler.h>
@@ -49,49 +48,8 @@
 #include <cpu/types.h>        /* for cpu_stack_t */
 #include <cpu/irq.h>          // IRQ_ASSERT_DISABLED()
 
-#include <struct/list.h>
-
-#if CONFIG_KERN_PREEMPT
-       #include <ucontext.h> // XXX
-#endif
-
-typedef struct Process
-{
-#if CONFIG_KERN_PRI
-       PriNode      link;        /**< Link Process into scheduler lists */
-#else
-       Node         link;        /**< Link Process into scheduler lists */
-#endif
-       cpu_stack_t  *stack;       /**< Per-process SP */
-       iptr_t       user_data;   /**< Custom data passed to the process */
-
-#if CONFIG_KERN_SIGNALS
-       sigmask_t    sig_wait;    /**< Signals the process is waiting for */
-       sigmask_t    sig_recv;    /**< Received signals */
-#endif
-
-#if CONFIG_KERN_HEAP
-       uint16_t     flags;       /**< Flags */
-#endif
-
-#if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL)
-       cpu_stack_t  *stack_base;  /**< Base of process stack */
-       size_t       stack_size;  /**< Size of process stack */
-#endif
-
-#if CONFIG_KERN_PREEMPT
-       ucontext_t   context;
-#endif
-
-#if CONFIG_KERN_MONITOR
-       struct ProcMonitor
-       {
-               Node        link;
-               const char *name;
-       } monitor;
-#endif
-
-} Process;
+#include <kern/proc.h>   // struct Process
+#include <kern/idle.h>        // idle_proc
 
 
 /**
@@ -103,19 +61,30 @@ typedef struct Process
 
 
 /** Track running processes. */
-extern REGISTER Process        *CurrentProcess;
+extern REGISTER Process        *current_process;
 
 /**
  * Track ready processes.
  *
  * Access to this list must be performed with interrupts disabled
  */
-extern REGISTER List     ProcReadyList;
+extern REGISTER List     proc_ready_list;
 
 #if CONFIG_KERN_PRI
-       #define SCHED_ENQUEUE_INTERNAL(proc) LIST_ENQUEUE(&ProcReadyList, &(proc)->link)
+       #define prio_next()     (LIST_EMPTY(&proc_ready_list) ? idle_proc->link.pri : \
+                                       ((PriNode *)LIST_HEAD(&proc_ready_list))->pri)
+       #define prio_curr()     (current_process->link.pri)
+
+       #define SCHED_ENQUEUE_INTERNAL(proc) \
+                       LIST_ENQUEUE(&proc_ready_list, &(proc)->link)
+       #define SCHED_ENQUEUE_HEAD_INTERNAL(proc) \
+                       LIST_ENQUEUE_HEAD(&proc_ready_list, &(proc)->link)
 #else
-       #define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+       #define prio_next()     0
+       #define prio_curr()     0
+
+       #define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&proc_ready_list, &(proc)->link)
+       #define SCHED_ENQUEUE_HEAD_INTERNAL(proc) ADDHEAD(&proc_ready_list, &(proc)->link)
 #endif
 
 /**
@@ -129,11 +98,18 @@ extern REGISTER List     ProcReadyList;
  */
 #define SCHED_ENQUEUE(proc)  do { \
                IRQ_ASSERT_DISABLED(); \
-               LIST_ASSERT_VALID(&ProcReadyList); \
+               LIST_ASSERT_VALID(&proc_ready_list); \
                SCHED_ENQUEUE_INTERNAL(proc); \
        } while (0)
 
-#ifdef CONFIG_KERN_PRI
+#define SCHED_ENQUEUE_HEAD(proc)  do { \
+               IRQ_ASSERT_DISABLED(); \
+               LIST_ASSERT_VALID(&proc_ready_list); \
+               SCHED_ENQUEUE_HEAD_INTERNAL(proc); \
+       } while (0)
+
+
+#if CONFIG_KERN_PRI
 /**
  * Changes the priority of an already enqueued process.
  *
@@ -144,13 +120,13 @@ extern REGISTER List     ProcReadyList;
  *
  * \note Performance could be improved with a different implementation of priority list.
  */
-INLINE void SCHED_CHANGE_PRI(struct Process *proc)
+INLINE void sched_reenqueue(struct Process *proc)
 {
        IRQ_ASSERT_DISABLED();
-       LIST_ASSERT_VALID(&ProcReadyList);
+       LIST_ASSERT_VALID(&proc_ready_list);
        Node *n;
        PriNode *pos = NULL;
-       FOREACH_NODE(n, &ProcReadyList)
+       FOREACH_NODE(n, &proc_ready_list)
        {
                if (n == &proc->link.link)
                {
@@ -164,18 +140,14 @@ INLINE void SCHED_CHANGE_PRI(struct Process *proc)
        if (pos)
        {
                REMOVE(&proc->link.link);
-               LIST_ENQUEUE(&ProcReadyList, &proc->link);
+               LIST_ENQUEUE(&proc_ready_list, &proc->link);
        }
 }
 #endif //CONFIG_KERN_PRI
 
 /// Schedule another process *without* adding the current one to the ready list.
 void proc_switch(void);
-
-#if CONFIG_KERN_PREEMPT
-void proc_entry(void (*user_entry)(void));
-void preempt_init(void);
-#endif
+void proc_entry(void);
 
 #if CONFIG_KERN_MONITOR
        /** Initialize the monitor */