* \author Stefano Fedrigo <aleph@develer.com>
*/
-/*
- * $Log$
- * Revision 1.5 2004/07/14 14:18:09 rasky
- * Merge da SC: Rimosso timer dentro il task, che è uno spreco di memoria per troppi task
- *
- * Revision 1.4 2004/07/13 19:21:28 aleph
- * Avoid warning for unused arg when compiled without some CONFIG_KERN_xx options
- *
- * Revision 1.3 2004/06/06 18:37:57 bernie
- * Rename event macros to look like regular functions.
- *
- * Revision 1.2 2004/06/03 11:27:09 bernie
- * Add dual-license information.
- *
- * Revision 1.1 2004/05/23 17:27:00 bernie
- * Import kern/ subdirectory.
- *
- */
+/*#*
+ *#* $Log$
+ *#* Revision 1.16 2004/10/03 20:39:28 bernie
+ *#* Import changes from sc/firmware.
+ *#*
+ *#* Revision 1.15 2004/09/20 03:29:39 bernie
+ *#* C++ fixes.
+ *#*
+ *#* Revision 1.14 2004/09/14 21:06:44 bernie
+ *#* Use debug.h instead of kdebug.h.
+ *#*
+ *#* Revision 1.13 2004/08/29 21:58:53 bernie
+ *#* Include macros.h explicityl.
+ *#*
+ *#* Revision 1.11 2004/08/24 16:09:08 bernie
+ *#* Add missing header.
+ *#*
+ *#* Revision 1.10 2004/08/24 16:07:01 bernie
+ *#* Use kputs()/kputchar() when possible.
+ *#*
+ *#* Revision 1.9 2004/08/24 14:26:57 bernie
+ *#* monitor_debug_stacks(): Conditionally compile on CONFIG_KERN_MONITOR.
+ *#*
+ *#* Revision 1.8 2004/08/14 19:37:57 rasky
+ *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
+ *#*
+ *#* Revision 1.7 2004/08/02 20:20:29 aleph
+ *#* Merge from project_ks
+ *#*
+ *#* Revision 1.6 2004/07/30 14:24:16 rasky
+ *#* Task switching con salvataggio perfetto stato di interrupt (SR)
+ *#* Kernel monitor per dump informazioni su stack dei processi
+ *#*
+ *#* Revision 1.5 2004/07/14 14:18:09 rasky
+ *#* Merge da SC: Rimosso timer dentro il task, che è uno spreco di memoria per troppi task
+ *#*
+ *#* Revision 1.4 2004/07/13 19:21:28 aleph
+ *#* Avoid warning for unused arg when compiled without some CONFIG_KERN_xx options
+ *#*
+ *#* Revision 1.3 2004/06/06 18:37:57 bernie
+ *#* Rename event macros to look like regular functions.
+ *#*
+ *#* Revision 1.2 2004/06/03 11:27:09 bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1 2004/05/23 17:27:00 bernie
+ *#* Import kern/ subdirectory.
+ *#*
+ *#*/
-#include "cpu.h"
#include "proc_p.h"
#include "proc.h"
+#include "cpu.h"
#include "event.h"
#include "hw.h"
-#include <drv/kdebug.h>
+#include <debug.h>
+#include <arch_config.h> /* ARCH_EMUL */
+#include <macros.h> /* ABS() */
#include <string.h> /* memset() */
-/* CPU dependent context switching routines */
-extern void asm_switch_context(cpustack_t **new_sp, cpustack_t **save_sp);
+/*!
+ * CPU dependent context switching routines.
+ *
+ * \note This function *MUST* preserve also the status of the interrupts.
+ */
+EXTERN_C void asm_switch_context(cpustack_t **new_sp, cpustack_t **save_sp);
+EXTERN_C int asm_switch_version(void);
/*
* The scheduer tracks ready and waiting processes
REGISTER Process *CurrentProcess;
REGISTER List ProcReadyList;
+
#if CONFIG_KERN_PREEMPTIVE
/*
* The time sharing scheduler forces a task switch when
/* The main process (the one that executes main()) */
struct Process MainProcess;
+
static void proc_init_struct(Process* proc)
{
/* Avoid warning for unused argument */
#endif
}
+
void proc_init(void)
{
INITLIST(&ProcReadyList);
+#if CONFIG_KERN_MONITOR
+ monitor_init();
+#endif
+
/* We "promote" the current context into a real process. The only thing we have
- to do is create a PCB and make it current. We don't need to setup the stack
- pointer because it will be written the first time we switch to another process. */
+ * to do is create a PCB and make it current. We don't need to setup the stack
+ * pointer because it will be written the first time we switch to another process.
+ */
proc_init_struct(&MainProcess);
CurrentProcess = &MainProcess;
+
+ /* Make sure the assembly routine is up-to-date with us */
+ ASSERT(asm_switch_version() == 1);
}
* \return Process structure of new created process
* if successful, NULL otherwise.
*/
-Process *proc_new(void (*entry)(void), size_t stacksize, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void), IPTR data, size_t stacksize, cpustack_t *stack_base)
{
Process *proc;
+ cpuflags_t flags;
size_t i;
size_t proc_size_words = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
#if CONFIG_KERN_HEAP
ASSERT(stacksize);
#endif
-#ifdef _DEBUG
+#if CONFIG_KERN_MONITOR
/* Fill-in the stack with a special marker to help debugging */
memset(stack_base, CONFIG_KERN_STACKFILLCODE, stacksize / sizeof(cpustack_t));
-#endif /* _DEBUG */
+#endif
/* Initialize the process control block */
if (CPU_STACK_GROWS_UPWARD)
}
proc_init_struct(proc);
+ proc->user_data = data;
#if CONFIG_KERN_HEAP
proc->stack_base = stack_base;
CPU_PUSH_WORD(proc->stack, CPU_REG_INIT_VALUE(i));
/* Add to ready list */
- DISABLE_INTS;
+ DISABLE_IRQSAVE(flags);
SCHED_ENQUEUE(proc);
- ENABLE_INTS;
+ ENABLE_IRQRESTORE(flags);
+
+#if CONFIG_KERN_MONITOR
+ monitor_add(proc, name, stack_base, stacksize);
+#endif
return proc;
}
* being switched out.
*/
static Process *old_process;
+ static cpuflags_t flags;
/* Remember old process to save its context later */
old_process = CurrentProcess;
- CurrentProcess = NULL;
- /* Poll on the ready queue for the first ready process
- */
- for(;;) /* forever */
+ /* Poll on the ready queue for the first ready process */
+ DISABLE_IRQSAVE(flags);
+ while (!(CurrentProcess = (struct Process*)REMHEAD(&ProcReadyList)))
{
- /* Do CPU specific idle processing (ARGH, should be moved to the end of the loop!) */
+ /*
+ * Make sure we physically reenable interrupts here, no matter what
+ * the current task status is. This is important because if we
+ * are idle-spinning, we must allow interrupts, otherwise no
+ * process will ever wake up.
+ *
+ * \todo If there was a way to code sig_wait so that it does not
+ * disable interrupts while waiting, there would not be any
+ * reason to do this.
+ */
+ ENABLE_INTS;
SCHEDULER_IDLE;
-
DISABLE_INTS;
- if (!ISLISTEMPTY(&ProcReadyList))
- {
- /* Get process from ready list */
- CurrentProcess = (Process *)ProcReadyList.head;
- REMOVE((Node *)CurrentProcess);
- ENABLE_INTS;
- break;
- }
- ENABLE_INTS;
}
+ ENABLE_IRQRESTORE(flags);
/* Optimization: don't switch contexts when the active
* process has not changed.
*/
#endif /* ARCH_EMUL */
+#if CONFIG_KERN_MONITOR
+ monitor_remove(CurrentProcess);
+#endif
+
CurrentProcess = NULL;
proc_schedule();
/* not reached */
*/
void proc_switch(void)
{
- DISABLE_INTS;
+ /* Just like proc_schedule, this function must not have auto variables. */
+ static cpuflags_t flags;
+
+ DISABLE_IRQSAVE(flags);
SCHED_ENQUEUE(CurrentProcess);
- ENABLE_INTS;
+ ENABLE_IRQRESTORE(flags);
+
proc_schedule();
}
return CurrentProcess;
}
+/*!
+ * Get the pointer to the user data of the current process
+ */
+IPTR proc_current_user_data(void)
+{
+ return CurrentProcess->user_data;
+}
#if 0 /* Simple testcase for the scheduler */
+#include <drv/timer.h>
+
/*!
* Proc scheduling test subthread 1
*/
*/
void NORETURN proc_test(void)
{
- proc_new(proc_test_thread1, sizeof(proc_test_stack1), proc_test_stack1);
- proc_new(proc_test_thread2, sizeof(proc_test_stack2), proc_test_stack2);
+ 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");
projects / bertos.git / blobdiff