kernel: preemptive and cooperative scheduler refactoring.

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

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index eea495f611cc5294d2b4deb3c730ad61a01c30c7..64fabb1290fef6052231bf3e682fb9c8a4830f49 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,51 +48,18 @@
 #include <cpu/types.h>        /* for cpu_stack_t */
 #include <cpu/irq.h>          // IRQ_ASSERT_DISABLED()
 
-#include <struct/list.h>
+#include <kern/proc.h>   // struct Process
 
-#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;
+#ifndef asm_switch_context
+/**
+ * CPU dependent context switching routines.
+ *
+ * Saving and restoring the context on the stack is done by a CPU-dependent
+ * support routine which usually needs to be written in assembly.
+ */
+EXTERN_C void asm_switch_context(cpu_stack_t **new_sp, cpu_stack_t **save_sp);
 #endif
 
-} Process;
-
-
 /**
  * \name Flags for Process.flags.
  * \{
@@ -103,19 +69,32 @@ 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) ? INT_MIN : \
+                                       ((PriNode *)LIST_HEAD(&proc_ready_list))->pri)
+       #define prio_proc(proc) (proc->link.pri)
+       #define prio_curr()     prio_proc(current_process)
+
+       #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_proc(proc) 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,10 +108,17 @@ 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)
 
+#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.
@@ -147,10 +133,10 @@ extern REGISTER List     ProcReadyList;
 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 +150,22 @@ INLINE void sched_reenqueue(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.
+/* Process trampoline */
+void proc_entry(void);
+
+/* 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
+/* Immediately schedule a particular process bypassing the scheduler. */
+void proc_wakeup(Process *proc);
+
+/* Initialize a scheduler class. */
+void proc_schedInit(void);
 
 #if CONFIG_KERN_MONITOR
        /** Initialize the monitor */
@@ -191,4 +181,38 @@ void preempt_init(void);
        void monitor_rename(Process *proc, const char *name);
 #endif /* CONFIG_KERN_MONITOR */
 
+#if CONFIG_KERN_PREEMPT
+INLINE int preempt_quantum(void)
+{
+       extern int _proc_quantum;
+       return _proc_quantum;
+}
+
+INLINE void proc_decQuantum(void)
+{
+       extern int _proc_quantum;
+       if (_proc_quantum > 0)
+               _proc_quantum--;
+}
+
+INLINE void preempt_reset_quantum(void)
+{
+       extern int _proc_quantum;
+       _proc_quantum = CONFIG_KERN_QUANTUM;
+}
+#else /* !CONFIG_KERN_PREEMPT */
+INLINE int preempt_quantum(void)
+{
+       return 0;
+}
+
+INLINE void proc_decQuantum(void)
+{
+}
+
+INLINE void preempt_reset_quantum(void)
+{
+}
+#endif /* CONFIG_KERN_PREEMPT */
+
 #endif /* KERN_PROC_P_H */