X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=6b1aaaff51fe97870b35a826ddaa96d4dd21d496;hb=83fc7933f968173822ed3f636d75860d4a747e76;hp=9137dfba9d97af2ecde7b927eee3119750bcf987;hpb=b0033f388edf3db04aec0901420a06bbc0f7ada7;p=bertos.git

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 9137dfba..6b1aaaff 100644
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -40,8 +40,10 @@
 #include "proc_p.h"
 #include "proc.h"
 
-#include "cfg/cfg_arch.h"  /* ARCH_EMUL */
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_arch.h"  // ARCH_EMUL
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_monitor.h"
+#include <cfg/macros.h>    // ROUND_UP2
 #include <cfg/module.h>
 #include <cfg/depend.h>    // CONFIG_DEPEND()
 
@@ -50,13 +52,11 @@
 #include <cpu/attr.h>
 #include <cpu/frame.h>
 
-#include <string.h>           /* memset() */
-
-// 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);
+#if CONFIG_KERN_HEAP
+	#include <struct/heap.h>
+#endif
 
+#include <string.h>           /* memset() */
 
 /*
  * The scheduer tracks ready processes by enqueuing them in the
@@ -83,8 +83,8 @@ REGISTER Process *CurrentProcess;
  */
 List StackFreeList;
 
-#define NPROC 8
-cpustack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpustack_t)];
+#define NPROC 10
+cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)];
 #endif
 
 /** The main process (the one that executes main()). */
@@ -98,6 +98,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
@@ -107,6 +108,7 @@ static void proc_init_struct(Process *proc)
 #if CONFIG_KERN_PRI
 	proc->link.pri = 0;
 #endif
+
 }
 
 MOD_DEFINE(proc);
@@ -147,10 +149,10 @@ void proc_init(void)
  * \return Process structure of new created process
  *         if successful, NULL otherwise.
  */
-struct Process *proc_new_with_name(UNUSED_ARG(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 = ROUND_UP2(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
@@ -158,7 +160,8 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 
 #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));
+	ASSERT(stack_base);
 
 	stack_size = CONFIG_KERN_MINSTACKSIZE;
 #elif CONFIG_KERN_HEAP
@@ -185,8 +188,13 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 #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 */
@@ -194,17 +202,21 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 	{
 		proc = (Process *)stack_base;
 		proc->stack = stack_base + PROC_SIZE_WORDS;
+		// On some architecture stack should be aligned, so we do it.
+		proc->stack = (void *)proc->stack + (sizeof(cpu_aligned_stack_t) - ((long)proc->stack % sizeof(cpu_stack_aligned_t)));
 		if (CPU_SP_ON_EMPTY_SLOT)
 			proc->stack++;
 	}
 	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);
+		// On some architecture stack should be aligned, so we do it.
+		proc->stack = (void *)proc - ((long)proc % sizeof(cpu_aligned_stack_t));
 		if (CPU_SP_ON_EMPTY_SLOT)
 			proc->stack--;
 	}
 
+	stack_size = stack_size - PROC_SIZE_WORDS;
 	proc_init_struct(proc);
 	proc->user_data = data;
 
@@ -310,9 +322,9 @@ void proc_setPri(struct Process *proc, int pri)
 
 		if (proc != CurrentProcess)
 		{
-				//proc_forbid();
-				//TODO: re-enqueue process
-				//pric_permit();
+				proc_forbid();
+				ATOMIC(sched_reenqueue(proc));
+				proc_permit();
 		}
 }
 #endif // CONFIG_KERN_PRI
@@ -358,14 +370,6 @@ void proc_exit(void)
 }
 
 
-/**
- * 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
  */