projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix stack alineament on new process.
[bertos.git]
/
bertos
/
kern
/
proc.c
diff --git
a/bertos/kern/proc.c
b/bertos/kern/proc.c
index b8431b50e1b277317716b3b9f7f9f20defdb673f..6b1aaaff51fe97870b35a826ddaa96d4dd21d496 100644
(file)
--- a/
bertos/kern/proc.c
+++ b/
bertos/kern/proc.c
@@
-41,7
+41,8
@@
#include "proc.h"
#include "cfg/cfg_arch.h" // ARCH_EMUL
#include "proc.h"
#include "cfg/cfg_arch.h" // ARCH_EMUL
-#include "cfg/cfg_kern.h"
+#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()
#include <cfg/macros.h> // ROUND_UP2
#include <cfg/module.h>
#include <cfg/depend.h> // CONFIG_DEPEND()
@@
-57,12
+58,6
@@
#include <string.h> /* memset() */
#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.
/*
* The scheduer tracks ready processes by enqueuing them in the
* ready list.
@@
-88,8
+83,8
@@
REGISTER Process *CurrentProcess;
*/
List StackFreeList;
*/
List StackFreeList;
-#define NPROC
8
-cpu
stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu
stack_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()). */
#endif
/** The main process (the one that executes main()). */
@@
-103,6
+98,7
@@
static void proc_init_struct(Process *proc)
#if CONFIG_KERN_SIGNALS
proc->sig_recv = 0;
#if CONFIG_KERN_SIGNALS
proc->sig_recv = 0;
+ proc->sig_wait = 0;
#endif
#if CONFIG_KERN_HEAP
#endif
#if CONFIG_KERN_HEAP
@@
-112,6
+108,7
@@
static void proc_init_struct(Process *proc)
#if CONFIG_KERN_PRI
proc->link.pri = 0;
#endif
#if CONFIG_KERN_PRI
proc->link.pri = 0;
#endif
+
}
MOD_DEFINE(proc);
}
MOD_DEFINE(proc);
@@
-152,10
+149,10
@@
void proc_init(void)
* \return Process structure of new created process
* if successful, NULL otherwise.
*/
* \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;
{
Process *proc;
- const size_t PROC_SIZE_WORDS = ROUND_UP2(sizeof(Process), sizeof(cpu
stack_t)) / sizeof(cpu
stack_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
#if CONFIG_KERN_HEAP
bool free_stack = false;
#endif
@@
-163,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. */
#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
stack_size = CONFIG_KERN_MINSTACKSIZE;
#elif CONFIG_KERN_HEAP
@@
-204,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;
{
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
{
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--;
}
if (CPU_SP_ON_EMPTY_SLOT)
proc->stack--;
}
+ stack_size = stack_size - PROC_SIZE_WORDS;
proc_init_struct(proc);
proc->user_data = data;
proc_init_struct(proc);
proc->user_data = data;
@@
-320,9
+322,9
@@
void proc_setPri(struct Process *proc, int pri)
if (proc != CurrentProcess)
{
if (proc != CurrentProcess)
{
-
//
proc_forbid();
- //TODO: re-enqueue process
-
//pri
c_permit();
+ proc_forbid();
+ ATOMIC(sched_reenqueue(proc));
+
pro
c_permit();
}
}
#endif // CONFIG_KERN_PRI
}
}
#endif // CONFIG_KERN_PRI
@@
-368,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
*/
/**
* Get the pointer to the user data of the current process
*/