Reformat.

[bertos.git] / bertos / kern / proc.c

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index 25ef1c67e4a29d8367cea39b6f8bf938b3770cea..6bf67a80c189e72040ae0bbc525b1b3f14fcfe51 100644 (file)
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -40,8 +40,13 @@
 #include "proc_p.h"
 #include "proc.h"
 
+#include "cfg/cfg_proc.h"
+#define LOG_LEVEL KERN_LOG_LEVEL
+#define LOG_FORMAT KERN_LOG_FORMAT
+#include <cfg/log.h>
+
 #include "cfg/cfg_arch.h"  // ARCH_EMUL
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_monitor.h"
 #include <cfg/macros.h>    // ROUND_UP2
 #include <cfg/module.h>
 #include <cfg/depend.h>    // CONFIG_DEPEND()
@@ -57,12 +62,6 @@
 
 #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);
-
-
 /*
  * The scheduer tracks ready processes by enqueuing them in the
  * ready list.
@@ -88,7 +87,7 @@ REGISTER Process *CurrentProcess;
  */
 List StackFreeList;
 
-#define NPROC 8
+#define NPROC 10
 cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)];
 #endif
 
@@ -103,6 +102,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
@@ -112,6 +112,7 @@ static void proc_init_struct(Process *proc)
 #if CONFIG_KERN_PRI
        proc->link.pri = 0;
 #endif
+
 }
 
 MOD_DEFINE(proc);
@@ -149,6 +150,14 @@ void proc_init(void)
 /**
  * Create a new process, starting at the provided entry point.
  *
+ *
+ * \note The function
+ * \code
+ * proc_new(entry, data, stacksize, stack)
+ * \endcode
+ * is a more convenient way to create a process, as you don't have to specify
+ * the name.
+ *
  * \return Process structure of new created process
  *         if successful, NULL otherwise.
  */
@@ -159,20 +168,21 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 #if CONFIG_KERN_HEAP
        bool free_stack = false;
 #endif
-       TRACEMSG("name=%s", name);
+       LOG_INFO("name=%s", name);
 
 #if (ARCH & ARCH_EMUL)
        /* Ignore stack provided by caller and use the large enough default instead. */
        PROC_ATOMIC(stack_base = (cpu_stack_t *)list_remHead(&StackFreeList));
+       ASSERT(stack_base);
 
-       stack_size = CONFIG_KERN_MINSTACKSIZE;
+       stack_size = KERN_MINSTACKSIZE;
 #elif CONFIG_KERN_HEAP
        /* Did the caller provide a stack for us? */
        if (!stack_base)
        {
                /* Did the caller specify the desired stack size? */
                if (!stack_size)
-                       stack_size = CONFIG_KERN_MINSTACKSIZE;
+                       stack_size = KERN_MINSTACKSIZE;
 
                /* Allocate stack dinamically */
                if (!(stack_base = heap_alloc(stack_size)))
@@ -204,17 +214,23 @@ 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 = (cpu_stack_t *)((uintptr_t)proc->stack + (sizeof(cpu_aligned_stack_t) - ((uintptr_t)proc->stack % sizeof(cpu_aligned_stack_t))));
                if (CPU_SP_ON_EMPTY_SLOT)
                        proc->stack++;
        }
        else
        {
                proc = (Process *)(stack_base + stack_size / sizeof(cpu_stack_t) - PROC_SIZE_WORDS);
-               proc->stack = (cpu_stack_t *)proc;
+               // On some architecture stack should be aligned, so we do it.
+               proc->stack = (cpu_stack_t *)((uintptr_t)proc - ((uintptr_t)proc % sizeof(cpu_aligned_stack_t)));
                if (CPU_SP_ON_EMPTY_SLOT)
                        proc->stack--;
        }
+       /* Ensure stack is aligned */
+       ASSERT((uintptr_t)proc->stack % sizeof(cpu_aligned_stack_t) == 0);
 
+       stack_size -= PROC_SIZE_WORDS * sizeof(cpu_stack_t);
        proc_init_struct(proc);
        proc->user_data = data;
 
@@ -231,22 +247,14 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 
                getcontext(&proc->context);
                proc->context.uc_stack.ss_sp = proc->stack;
-               proc->context.uc_stack.ss_size = stack_size - PROC_SIZE_WORDS - 1;
+               proc->context.uc_stack.ss_size = stack_size - 1;
                proc->context.uc_link = NULL;
                makecontext(&proc->context, (void (*)(void))proc_entry, 1, entry);
 
        #else // !CONFIG_KERN_PREEMPT
-       {
-               size_t i;
 
-               /* Initialize process stack frame */
-               CPU_PUSH_CALL_FRAME(proc->stack, proc_exit);
-               CPU_PUSH_CALL_FRAME(proc->stack, entry);
+               CPU_CREATE_NEW_STACK(proc->stack, entry, proc_exit);
 
-               /* Push a clean set of CPU registers for asm_switch_context() */
-               for (i = 0; i < CPU_SAVED_REGS_CNT; i++)
-                       CPU_PUSH_WORD(proc->stack, CPU_REG_INIT_VALUE(i));
-       }
        #endif // CONFIG_KERN_PREEMPT
 
        #if CONFIG_KERN_MONITOR
@@ -320,9 +328,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
@@ -332,7 +340,7 @@ void proc_setPri(struct Process *proc, int pri)
  */
 void proc_exit(void)
 {
-       TRACEMSG("%p:%s", CurrentProcess, proc_currentName());
+       LOG_INFO("%p:%s", CurrentProcess, proc_currentName());
 
 #if CONFIG_KERN_MONITOR
        monitor_remove(CurrentProcess);