* 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
#define KERN_PROC_P_H
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_monitor.h"
+
#include <cfg/compiler.h>
#include <cpu/types.h> /* for cpu_stack_t */
+#include <cpu/irq.h> // IRQ_ASSERT_DISABLED()
-#include <mware/list.h>
-
-typedef struct Process
-{
- Node link; /**< Link Process into scheduler lists */
- cpustack_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_PREEMPTIVE
- int forbid_cnt; /**< Nesting count for proc_forbid()/proc_permit(). */
-#endif
-
-#if CONFIG_KERN_HEAP
- uint16_t flags; /**< Flags */
- cpustack_t *stack_base; /**< Base of process stack */
- size_t stack_size; /**< Size of process stack */
-#endif
-
-#if CONFIG_KERN_MONITOR
- struct ProcMonitor
- {
- Node link;
- const char *name;
- cpustack_t *stack_base;
- size_t stack_size;
- } monitor;
+#if CONFIG_KERN_PREEMPT
+ #include <ucontext.h> // XXX
#endif
-} Process;
+#include <kern/proc.h> // struct Process
/**
/** Track running processes. */
extern REGISTER Process *CurrentProcess;
-/** Track ready processes. */
+/**
+ * Track ready processes.
+ *
+ * Access to this list must be performed with interrupts disabled
+ */
extern REGISTER List ProcReadyList;
+#if CONFIG_KERN_PRI
+ #define SCHED_ENQUEUE_INTERNAL(proc) LIST_ENQUEUE(&ProcReadyList, &(proc)->link)
+#else
+ #define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+#endif
-/** Enqueue a task in the ready list. */
-#define SCHED_ENQUEUE(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+/**
+ * Enqueue a process 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 Access to the scheduler ready list must be performed with
+ * interrupts disabled.
+ */
+#define SCHED_ENQUEUE(proc) do { \
+ IRQ_ASSERT_DISABLED(); \
+ LIST_ASSERT_VALID(&ProcReadyList); \
+ SCHED_ENQUEUE_INTERNAL(proc); \
+ } while (0)
-/** Schedule to another process *without* adding the current to the ready list. */
-void proc_schedule(void);
+#if CONFIG_KERN_PRI
+/**
+ * Changes the priority of an already enqueued process.
+ *
+ * Searches and removes the process from the ready list, then uses LIST_ENQUEUE(()
+ * to insert again to fix priority.
+ *
+ * No action is performed for processes that aren't in the ready list, eg. in semaphore queues.
+ *
+ * \note Performance could be improved with a different implementation of priority list.
+ */
+INLINE void sched_reenqueue(struct Process *proc)
+{
+ IRQ_ASSERT_DISABLED();
+ LIST_ASSERT_VALID(&ProcReadyList);
+ Node *n;
+ PriNode *pos = NULL;
+ FOREACH_NODE(n, &ProcReadyList)
+ {
+ if (n == &proc->link.link)
+ {
+ pos = (PriNode *)n;
+ break;
+ }
+ }
+
+ // only remove and enqueue again if process is already in the ready list
+ // otherwise leave it alone
+ if (pos)
+ {
+ REMOVE(&proc->link.link);
+ LIST_ENQUEUE(&ProcReadyList, &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
#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 */
-