* \brief Internal scheduler structures and definitions for processes.
*
* \version $Id$
- *
* \author Bernie Innocenti <bernie@codewiz.org>
*/
#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
{
sigmask_t sig_recv; /**< Received signals */
#endif
-#if CONFIG_KERN_PREEMPTIVE
- int forbid_cnt; /**< Nesting count for proc_forbid()/proc_permit(). */
-#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
+#if CONFIG_KERN_PREEMPTIVE
+ ucontext_t context;
+#endif
+
#if CONFIG_KERN_MONITOR
struct ProcMonitor
{
Node link;
const char *name;
- cpustack_t *stack_base;
- size_t stack_size;
} monitor;
#endif
/** 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. */
-#define SCHED_ENQUEUE(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+/**
+ * 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); \
+ ADDTAIL(&ProcReadyList, &(proc)->link); \
+ } while (0)
/** Schedule to another process *without* adding the current to the ready list. */
void proc_schedule(void);
+#if CONFIG_KERN_PREEMPT
+void proc_entry(void (*user_entry)(void));
+void preempt_init(void);
+#endif
+
#if CONFIG_KERN_MONITOR
/** Initialize the monitor */
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 */
-