Initial (nonworking) draft of preemptive task switching

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

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index c0b2bdc5bfe7ae4683fb4ec6c71e01bf47dd2853..a98f9428aa65f684ad414c4f2a0267c67f0547a1 100644 (file)
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -27,15 +27,14 @@
  * the GNU General Public License.
  *
  * Copyright 2001, 2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2000, 2001 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 1999, 2000, 2001 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
  * \brief Internal scheduler structures and definitions for processes.
  *
  * \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #ifndef KERN_PROC_P_H
@@ -46,7 +45,11 @@
 
 #include <cpu/types.h>        /* for cpu_stack_t */
 
-#include <mware/list.h>
+#include <struct/list.h>
+
+#if CONFIG_KERN_PREEMPTIVE
+       #include <ucontext.h> // XXX
+#endif
 
 typedef struct Process
 {
@@ -61,10 +64,15 @@ typedef struct Process
 
 #if CONFIG_KERN_PREEMPTIVE
        int          forbid_cnt;  /**< Nesting count for proc_forbid()/proc_permit(). */
+       bool         leaving;     /**< XXX: maybe global? */
+       ucontext_t   context;
 #endif
 
 #if CONFIG_KERN_HEAP
        uint16_t     flags;       /**< Flags */
+#endif
+
+#if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL)
        cpustack_t  *stack_base;  /**< Base of process stack */
        size_t       stack_size;  /**< Size of process stack */
 #endif
@@ -74,8 +82,6 @@ typedef struct Process
        {
                Node        link;
                const char *name;
-               cpustack_t *stack_base;
-               size_t      stack_size;
        } monitor;
 #endif
 
@@ -93,11 +99,24 @@ typedef struct Process
 /** Track running processes. */
 extern REGISTER Process        *CurrentProcess;
 
-/** Track ready processes. */
+/**
+ * Track ready processes.
+ *
+ * Access to this list must be protected with a proc_forbid() / proc_premit()
+ * pair, or with SCHED_ATOMIC()
+ */
 extern REGISTER List     ProcReadyList;
 
 
-/** Enqueue a task in the ready list. */
+/**
+ * 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)  ADDTAIL(&ProcReadyList, &(proc)->link)
 
 /** Schedule to another process *without* adding the current to the ready list. */
@@ -108,14 +127,13 @@ void proc_schedule(void);
        void monitor_init(void);
 
        /** Register a process into the monitor */
-       void monitor_add(Process *proc, const char *name, cpustack_t *stack, size_t stacksize);
+       void monitor_add(Process *proc, const char *name);
 
        /** Unregister a process from the monitor */
        void monitor_remove(Process *proc);
 
        /** Rename a process */
-       void monitor_rename(Process *proc, const char* name);
+       void monitor_rename(Process *proc, const char *name);
 #endif /* CONFIG_KERN_MONITOR */
 
 #endif /* KERN_PROC_P_H */
-