X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=27d65fe288193a3a78aa579c370fbb43273f1586;hb=d9d931610bca1df6ceb9227eacc9ff2c7f89b77a;hp=a0e87be22ba6f870e0536db7e35edd997cea9a6f;hpb=0e8fc7e3fe0e2cb2e75d0b3b9da1899f74074d0c;p=bertos.git

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index a0e87be2..27d65fe2 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -40,54 +40,15 @@
 #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 <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 */
-
-#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)
-	cpustack_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;
-#endif
-
-} Process;
+#include <kern/proc.h>   // struct Process
 
 
 /**
@@ -99,48 +60,102 @@ typedef struct Process
 
 
 /** Track running processes. */
-extern REGISTER Process	*CurrentProcess;
+extern REGISTER Process	*current_process;
 
 /**
  * Track ready processes.
  *
- * Access to this list must be protected with a proc_forbid() / proc_premit()
- * pair, or with SCHED_ATOMIC()
+ * Access to this list must be performed with interrupts disabled
  */
-extern REGISTER List     ProcReadyList;
+extern REGISTER List     proc_ready_list;
 
 #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 another process *without* adding the current one to the ready list.
-void proc_switch(void);
+	#define prio_next()	(LIST_EMPTY(&proc_ready_list) ? INT_MIN : \
+					((PriNode *)LIST_HEAD(&proc_ready_list))->pri)
+	#define prio_curr()	(current_process->link.pri)
+
+	#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 prio_next()	0
+	#define prio_curr()	0
 
-#if CONFIG_KERN_PREEMPT
-void proc_entry(void (*user_entry)(void));
-void preempt_init(void);
+	#define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&proc_ready_list, &(proc)->link)
+	#define SCHED_ENQUEUE_HEAD_INTERNAL(proc) ADDHEAD(&proc_ready_list, &(proc)->link)
 #endif
 
+/**
+ * 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(&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.
+ *
+ * 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(&proc_ready_list);
+	Node *n;
+	PriNode *pos = NULL;
+	FOREACH_NODE(n, &proc_ready_list)
+	{
+		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(&proc_ready_list, &proc->link);
+	}
+}
+#endif //CONFIG_KERN_PRI
+
+/* Process trampoline */
+void proc_entry(void);
+
+/* Schedule another process *without* adding the current one to the ready list. */
+void proc_switch(void);
+
+/* Low level scheduling routine. */
+void proc_schedule(void);
+
+/* Initialize a scheduler class. */
+void proc_schedInit(void);
+
 #if CONFIG_KERN_MONITOR
 	/** Initialize the monitor */
 	void monitor_init(void);