X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=15817ef79803ea26a9ded4679b14a9bdf6e711fa;hb=ce73a2884628b0beac1f41f403bf0df9096ab38c;hp=7fe9c70abc555029f5e7ce17044ab8b7713153fe;hpb=76c53bfa0136be55cf17e57b1ee098e5dfeefa70;p=bertos.git

diff --git a/kern/proc.c b/kern/proc.c
index 7fe9c70a..15817ef7 100755
--- a/kern/proc.c
+++ b/kern/proc.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2001,2004 Develer S.r.l. (http://www.develer.com/)
@@ -17,6 +17,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.32  2006/09/20 14:19:23  marco
+ *#* Restored test.
+ *#*
+ *#* Revision 1.31  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.30  2006/03/27 04:49:23  bernie
+ *#* CPU_IDLE(): Fix for new emulator.
+ *#*
+ *#* Revision 1.29  2006/02/24 01:17:05  bernie
+ *#* Update for new emulator.
+ *#*
+ *#* Revision 1.28  2006/02/21 16:06:55  bernie
+ *#* Cleanup/update process scheduling.
+ *#*
  *#* Revision 1.27  2005/11/04 16:20:02  bernie
  *#* Fix reference to README.devlib in header.
  *#*
@@ -100,16 +115,16 @@
 
 #include "proc_p.h"
 #include "proc.h"
+//#include "hw.h"
+#include <mware/event.h>
 #include <cfg/cpu.h>
-#include "event.h"
-#include "hw.h"
 #include <cfg/debug.h>
 #include <cfg/arch_config.h>  /* ARCH_EMUL */
 #include <cfg/macros.h>  /* ABS() */
 
 #include <string.h> /* memset() */
 
-/*!
+/**
  * CPU dependent context switching routines.
  *
  * \note This function *MUST* preserve also the status of the interrupts.
@@ -142,7 +157,7 @@ uint16_t Quantum;
 extern List StackFreeList;
 #endif
 
-/*! The main process (the one that executes main()). */
+/** The main process (the one that executes main()). */
 struct Process MainProcess;
 
 
@@ -185,13 +200,13 @@ void proc_init(void)
 }
 
 
-/*!
+/**
  * Create a new process, starting at the provided entry point.
  *
  * \return Process structure of new created process
  *         if successful, NULL otherwise.
  */
-struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base)
 {
 	Process *proc;
 	size_t i;
@@ -202,9 +217,9 @@ struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void
 
 #if (ARCH & ARCH_EMUL)
 	/* Ignore stack provided by caller and use the large enough default instead. */
-	stack_base = (cpustack_t *)StackFreeList.head;
-	REMOVE((Node *)stack_base);
-	stacksize = DEF_STACKSIZE;
+	stack_base = (cpustack_t *)LIST_HEAD(&StackFreeList);
+	REMOVE(LIST_HEAD(&StackFreeList));
+	stacksize = CONFIG_KERN_DEFSTACKSIZE;
 #elif CONFIG_KERN_HEAP
 	/* Did the caller provide a stack for us? */
 	if (!stack_base)
@@ -274,7 +289,7 @@ struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void
 	return proc;
 }
 
-/*! Rename a process */
+/** Rename a process */
 void proc_rename(struct Process *proc, const char *name)
 {
 #if CONFIG_KERN_MONITOR
@@ -285,7 +300,7 @@ void proc_rename(struct Process *proc, const char *name)
 }
 
 
-/*!
+/**
  * System scheduler: pass CPU control to the next process in
  * the ready queue.
  *
@@ -305,12 +320,14 @@ void proc_schedule(void)
 	/* Remember old process to save its context later */
 	old_process = CurrentProcess;
 
+#ifdef IRQ_RUNNING
 	/* Scheduling in interrupts is a nono. */
 	ASSERT(!IRQ_RUNNING());
+#endif
 
 	/* Poll on the ready queue for the first ready process */
 	IRQ_SAVE_DISABLE(flags);
-	while (!(CurrentProcess = (struct Process *)REMHEAD(&ProcReadyList)))
+	while (!(CurrentProcess = (struct Process *)list_remHead(&ProcReadyList)))
 	{
 		/*
 		 * Make sure we physically reenable interrupts here, no matter what
@@ -323,7 +340,7 @@ void proc_schedule(void)
 		 * reason to do this.
 		 */
 		IRQ_ENABLE;
-		SCHEDULER_IDLE;
+		CPU_IDLE;
 		IRQ_DISABLE;
 	}
 	IRQ_RESTORE(flags);
@@ -355,13 +372,18 @@ void proc_schedule(void)
 }
 
 
-/*!
+/**
  * Terminate the current process
  */
 void proc_exit(void)
 {
+#if CONFIG_KERN_MONITOR
+	monitor_remove(CurrentProcess);
+#endif
+
 #if CONFIG_KERN_HEAP
-	/* The following code is BROKEN.
+	/*
+	 * The following code is BROKEN.
 	 * We are freeing our own stack before entering proc_schedule()
 	 * BAJO: A correct fix would be to rearrange the scheduler with
 	 *  an additional parameter which frees the old stack/process
@@ -373,28 +395,25 @@ void proc_exit(void)
 #endif
 
 #if (ARCH & ARCH_EMUL)
-#error This is wrong
+#warning This is wrong
 	/* Reinsert process stack in free list */
 	ADDHEAD(&StackFreeList, (Node *)(CurrentProcess->stack
-		- (DEF_STACKSIZE / sizeof(cpustack_t))));
+		- (CONFIG_KERN_DEFSTACKSIZE / sizeof(cpustack_t))));
 
-	/* NOTE: At this point the first two words of what used
+	/*
+	 * NOTE: At this point the first two words of what used
 	 * to be our stack contain a list node. From now on, we
 	 * rely on the compiler not reading/writing the stack.
 	 */
 #endif /* ARCH_EMUL */
 
-#if CONFIG_KERN_MONITOR
-	monitor_remove(CurrentProcess);
-#endif
-
 	CurrentProcess = NULL;
 	proc_schedule();
 	/* not reached */
 }
 
 
-/*!
+/**
  * Co-operative context switch
  */
 void proc_switch(void)
@@ -410,7 +429,7 @@ void proc_switch(void)
 }
 
 
-/*!
+/**
  * Get the pointer to the current process
  */
 struct Process *proc_current(void)
@@ -418,7 +437,7 @@ struct Process *proc_current(void)
 	return CurrentProcess;
 }
 
-/*!
+/**
  * Get the pointer to the user data of the current process
  */
 iptr_t proc_current_user_data(void)
@@ -429,7 +448,7 @@ iptr_t proc_current_user_data(void)
 
 #if CONFIG_KERN_PREEMPTIVE
 
-/*!
+/**
  * Disable preemptive task switching.
  *
  * The scheduler maintains a per-process nesting counter.  Task switching is
@@ -449,7 +468,7 @@ void proc_forbid(void)
 	++CurrentProcess->forbid_cnt;
 }
 
-/*!
+/**
  * Re-enable preemptive task switching.
  *
  * \sa proc_forbid()
@@ -461,62 +480,3 @@ void proc_permit(void)
 }
 
 #endif /* CONFIG_KERN_PREEMPTIVE */
-
-
-#if 0 /* Simple testcase for the scheduler */
-
-#include <drv/timer.h>
-
-/*!
- * Proc scheduling test subthread 1
- */
-static void NORETURN proc_test_thread1(void)
-{
-	for (;;)
-	{
-		kputs(">task 1\n");
-		timer_delay(50);
-		proc_switch();
-	}
-}
-
-/*!
- * Proc scheduling test subthread 2
- */
-static void NORETURN proc_test_thread2(void)
-{
-	for (;;)
-	{
-		kputs(">task 2\n");
-		timer_delay(75);
-		proc_switch();
-	}
-}
-
-static cpustack_t proc_test_stack1[CONFIG_KERN_DEFSTACKSIZE/sizeof(cpustack_t)];
-static cpustack_t proc_test_stack2[CONFIG_KERN_DEFSTACKSIZE/sizeof(cpustack_t)];
-
-/*!
- * Proc scheduling test
- */
-void NORETURN proc_test(void)
-{
-	proc_new(proc_test_thread1, NULL, sizeof(proc_test_stack1), proc_test_stack1);
-	proc_new(proc_test_thread2, NULL, sizeof(proc_test_stack2), proc_test_stack2);
-	kputs("Created tasks\n");
-
-	kputs("stack1:\n");
-	kdump(proc_test_stack1+sizeof(proc_test_stack1)-64, 64);
-	kputs("stack2:\n");
-	kdump(proc_test_stack2+sizeof(proc_test_stack1)-64, 64);
-
-	for (;;)
-	{
-		kputs(">main task\n");
-		timer_delay(93);
-		proc_switch();
-	}
-
-	ASSERT(false);
-}
-#endif