* \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_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
cpustack_t *stack; /**< Per-process SP */
iptr_t user_data; /**< Custom data passed to the 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
size_t stack_size; /**< Size of process stack */
#endif
+#if CONFIG_KERN_PREEMPT
+ ucontext_t context;
+#endif
+
#if CONFIG_KERN_MONITOR
struct ProcMonitor
{
*/
extern REGISTER List ProcReadyList;
-
-/**
- * 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)
+#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
/** 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);
#endif /* CONFIG_KERN_MONITOR */
#endif /* KERN_PROC_P_H */
-