X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=f1b5aa34805503296c4954ea248cf17186fecdb1;hb=32d1445272120a254d77ce8d1af1f527da7a2c17;hp=c0b2bdc5bfe7ae4683fb4ec6c71e01bf47dd2853;hpb=c22fe24a0da896a52dbc3882390ec18a440ef56a;p=bertos.git

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index c0b2bdc5..f1b5aa34 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -27,59 +27,29 @@
  * 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;
-#endif
-
-} Process;
+#include <kern/proc.h>   // struct Process
+#include <kern/idle.h>        // idle_proc
 
 
 /**
@@ -91,31 +61,106 @@ typedef struct Process
 
 
 /** Track running processes. */
-extern REGISTER Process	*CurrentProcess;
+extern REGISTER Process	*current_process;
+
+/**
+ * Track ready processes.
+ *
+ * Access to this list must be performed with interrupts disabled
+ */
+extern REGISTER List     proc_ready_list;
+
+#if CONFIG_KERN_PRI
+	#define prio_next()	(LIST_EMPTY(&proc_ready_list) ? idle_proc->link.pri : \
+					((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
+
+	#define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&proc_ready_list, &(proc)->link)
+	#define SCHED_ENQUEUE_HEAD_INTERNAL(proc) ADDHEAD(&proc_ready_list, &(proc)->link)
+#endif
 
-/** Track ready processes. */
-extern REGISTER List     ProcReadyList;
+/**
+ * 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)
 
-/** Enqueue a task in the ready list. */
-#define SCHED_ENQUEUE(proc)  ADDTAIL(&ProcReadyList, &(proc)->link)
 
-/** 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(&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
+
+/// Schedule another process *without* adding the current one to the ready list.
+void proc_switch(void);
+void proc_entry(void);
 
 #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 */
-