X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=c971c09fe08fd3a10183ca9203f0776493fc3c10;hb=2e550c2c1429d917fd7188c3a92bc7eb87536d98;hp=b49c87f3e0eb666cbf94170b103d6b836ebfb7f5;hpb=cf6017f59fb2ff71423c716ad9d9f60a1b65c7d0;p=bertos.git

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index b49c87f3..c971c09f 100644
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -30,8 +30,7 @@
  * Copyright 1999, 2000, 2001, 2008 Bernie Innocenti <bernie@codewiz.org>
  * -->
  *
- * \brief Simple realtime multitasking scheduler.
- *        Context switching is only done cooperatively.
+ * \brief Simple cooperative multitasking scheduler.
  *
  * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
@@ -41,21 +40,27 @@
 #include "proc_p.h"
 #include "proc.h"
 
-#include "cfg/cfg_arch.h"  /* ARCH_EMUL */
+#include "cfg/cfg_arch.h"  // ARCH_EMUL
 #include "cfg/cfg_kern.h"
+#include <cfg/macros.h>    // ROUND_UP2
 #include <cfg/module.h>
+#include <cfg/depend.h>    // CONFIG_DEPEND()
 
 #include <cpu/irq.h>
 #include <cpu/types.h>
 #include <cpu/attr.h>
 #include <cpu/frame.h>
 
-#include <string.h>           /* memset() */
+#if CONFIG_KERN_HEAP
+	#include <struct/heap.h>
+#endif
 
-// FIXME: move somewhere
-#define CONFIG_DEPEND(FEATURE, DEPS)  STATIC_ASSERT(!(FEATURE) || !!(DEPS))
+#include <string.h>           /* memset() */
 
-CONFIG_DEPEND(CONFIG_KERN_PRI, CONFIG_KERN_PREEMPT);
+// Check config dependencies
+CONFIG_DEPEND(CONFIG_KERN_SIGNALS,    CONFIG_KERN_SCHED);
+CONFIG_DEPEND(CONFIG_KERN_SEMAPHORES, CONFIG_KERN_SIGNALS);
+CONFIG_DEPEND(CONFIG_KERN_MONITOR,    CONFIG_KERN_SCHED);
 
 
 /*
@@ -75,11 +80,16 @@ REGISTER Process *CurrentProcess;
 
 #if (ARCH & ARCH_EMUL)
 /*
- * In hosted environments, we must emulate the stack on the real process stack.
+ * In some hosted environments, we must emulate the stack on the real
+ * process stack to satisfy consistency checks in system libraries and
+ * because some ABIs place trampolines on the stack.
  *
  * Access to this list must be protected by PROC_ATOMIC().
  */
-extern List StackFreeList;
+List StackFreeList;
+
+#define NPROC 8
+cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)];
 #endif
 
 /** The main process (the one that executes main()). */
@@ -93,6 +103,7 @@ static void proc_init_struct(Process *proc)
 
 #if CONFIG_KERN_SIGNALS
 	proc->sig_recv = 0;
+	proc->sig_wait = 0;
 #endif
 
 #if CONFIG_KERN_HEAP
@@ -102,6 +113,7 @@ static void proc_init_struct(Process *proc)
 #if CONFIG_KERN_PRI
 	proc->link.pri = 0;
 #endif
+
 }
 
 MOD_DEFINE(proc);
@@ -110,6 +122,12 @@ void proc_init(void)
 {
 	LIST_INIT(&ProcReadyList);
 
+#if ARCH & ARCH_EMUL
+	LIST_INIT(&StackFreeList);
+	for (int i = 0; i < NPROC; i++)
+		ADDTAIL(&StackFreeList, (Node *)proc_stacks[i]);
+#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
@@ -130,17 +148,16 @@ void proc_init(void)
 	MOD_INIT(proc);
 }
 
-
 /**
  * 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 stack_size, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)(void), iptr_t data, size_t stack_size, cpu_stack_t *stack_base)
 {
 	Process *proc;
-	const size_t PROC_SIZE_WORDS = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
+	const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpu_stack_t)) / sizeof(cpu_stack_t);
 #if CONFIG_KERN_HEAP
 	bool free_stack = false;
 #endif
@@ -148,7 +165,7 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi
 
 #if (ARCH & ARCH_EMUL)
 	/* Ignore stack provided by caller and use the large enough default instead. */
-	PROC_ATOMIC(stack_base = (cpustack_t *)list_remHead(&StackFreeList));
+	PROC_ATOMIC(stack_base = (cpu_stack_t *)list_remHead(&StackFreeList));
 
 	stack_size = CONFIG_KERN_MINSTACKSIZE;
 #elif CONFIG_KERN_HEAP
@@ -175,8 +192,13 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi
 #endif // !ARCH_EMUL && !CONFIG_KERN_HEAP
 
 #if CONFIG_KERN_MONITOR
-	/* Fill-in the stack with a special marker to help debugging */
-	memset(stack_base, CONFIG_KERN_STACKFILLCODE, stack_size);
+	/*
+	 * Fill-in the stack with a special marker to help debugging.
+	 * On 64bit platforms, CONFIG_KERN_STACKFILLCODE is larger
+	 * than an int, so the (int) cast is required to silence the
+	 * warning for truncating its size.
+	 */
+	memset(stack_base, (int)CONFIG_KERN_STACKFILLCODE, stack_size);
 #endif
 
 	/* Initialize the process control block */
@@ -189,8 +211,8 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi
 	}
 	else
 	{
-		proc = (Process *)(stack_base + stack_size / sizeof(cpustack_t) - PROC_SIZE_WORDS);
-		proc->stack = (cpustack_t *)proc;
+		proc = (Process *)(stack_base + stack_size / sizeof(cpu_stack_t) - PROC_SIZE_WORDS);
+		proc->stack = (cpu_stack_t *)proc;
 		if (CPU_SP_ON_EMPTY_SLOT)
 			proc->stack--;
 	}
@@ -270,6 +292,8 @@ void proc_rename(struct Process *proc, const char *name)
 #endif
 }
 
+
+#if CONFIG_KERN_PRI
 /**
  * Change the scheduling priority of a process.
  *
@@ -303,6 +327,7 @@ void proc_setPri(struct Process *proc, int pri)
 				//pric_permit();
 		}
 }
+#endif // CONFIG_KERN_PRI
 
 /**
  * Terminate the current process
@@ -340,19 +365,11 @@ void proc_exit(void)
 #endif /* ARCH_EMUL */
 
 	CurrentProcess = NULL;
-	proc_schedule();
+	proc_switch();
 	/* not reached */
 }
 
 
-/**
- * Get the pointer to the current process
- */
-struct Process *proc_current(void)
-{
-	return CurrentProcess;
-}
-
 /**
  * Get the pointer to the user data of the current process
  */