projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the bug related to the empty version list
[bertos.git]
/
bertos
/
kern
/
proc_p.h
diff --git
a/bertos/kern/proc_p.h
b/bertos/kern/proc_p.h
index a0191d8301eaf44b4a1689d729f523a1150de725..b148057c4a02fc256a5ade9505ef9986d246b34e 100644
(file)
--- a/
bertos/kern/proc_p.h
+++ b/
bertos/kern/proc_p.h
@@
-34,24
+34,34
@@
* \brief Internal scheduler structures and definitions for processes.
*
* \version $Id$
* \brief Internal scheduler structures and definitions for processes.
*
* \version $Id$
- *
* \author Bernie Innocenti <bernie@codewiz.org>
*/
#ifndef KERN_PROC_P_H
#define KERN_PROC_P_H
* \author Bernie Innocenti <bernie@codewiz.org>
*/
#ifndef KERN_PROC_P_H
#define KERN_PROC_P_H
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
+#include "cfg/cfg_monitor.h"
+
#include <cfg/compiler.h>
#include <cpu/types.h> /* for cpu_stack_t */
#include <cfg/compiler.h>
#include <cpu/types.h> /* for cpu_stack_t */
-#include <mware/list.h>
+#include <struct/list.h>
+
+#if CONFIG_KERN_PREEMPT
+ #include <ucontext.h> // XXX
+#endif
typedef struct Process
{
typedef struct Process
{
+#if CONFIG_KERN_PRI
+ PriNode link; /**< Link Process into scheduler lists */
+#else
Node link; /**< Link Process into scheduler lists */
Node link; /**< Link Process into scheduler lists */
- cpustack_t *stack; /**< Per-process SP */
+#endif
+ cpu_stack_t *stack; /**< Per-process SP */
iptr_t user_data; /**< Custom data passed to the process */
#if CONFIG_KERN_SIGNALS
iptr_t user_data; /**< Custom data passed to the process */
#if CONFIG_KERN_SIGNALS
@@
-59,19
+69,19
@@
typedef struct Process
sigmask_t sig_recv; /**< Received signals */
#endif
sigmask_t sig_recv; /**< Received signals */
#endif
-#if CONFIG_KERN_PREEMPTIVE
- int forbid_cnt; /**< Nesting count for proc_forbid()/proc_permit(). */
-#endif
-
#if CONFIG_KERN_HEAP
uint16_t flags; /**< Flags */
#endif
#if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL)
#if CONFIG_KERN_HEAP
uint16_t flags; /**< Flags */
#endif
#if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL)
- cpustack_t *stack_base; /**< Base of process stack */
+ cpu
_
stack_t *stack_base; /**< Base of process stack */
size_t stack_size; /**< Size of process stack */
#endif
size_t stack_size; /**< Size of process stack */
#endif
+#if CONFIG_KERN_PREEMPT
+ ucontext_t context;
+#endif
+
#if CONFIG_KERN_MONITOR
struct ProcMonitor
{
#if CONFIG_KERN_MONITOR
struct ProcMonitor
{
@@
-97,26
+107,39
@@
extern REGISTER Process *CurrentProcess;
/**
* Track ready processes.
*
/**
* Track ready processes.
*
- * Access to this list must be protected with a proc_forbid() / proc_premit()
- * pair, or with SCHED_ATOMIC()
+ * Access to this list must be performed with interrupts disabled
*/
extern REGISTER List ProcReadyList;
*/
extern REGISTER List ProcReadyList;
+#if CONFIG_KERN_PRI
+ #define SCHED_ENQUEUE_INTERNAL(proc) LIST_ENQUEUE(&ProcReadyList, &(proc)->link)
+#else
+ #define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+#endif
/**
/**
- * Enqueue a
task
in the ready list.
+ * Enqueue a
process
in the ready list.
*
* Always use this macro to instert a process in the ready list, as its
* might vary to implement a different scheduling algorithms.
*
*
* Always use this macro to instert a process in the ready list, as its
* might vary to implement a different scheduling algorithms.
*
- * \note This macro is *NOT* protected against the scheduler. Access to
- * this list must be protected with a proc_forbid() / proc_premit()
- * pair, or with SCHED_ATOMIC()
+ * \note Access to the scheduler ready list must be performed with
+ * interrupts disabled.
*/
*/
-#define SCHED_ENQUEUE(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+#define SCHED_ENQUEUE(proc) do { \
+ IRQ_ASSERT_DISABLED(); \
+ LIST_ASSERT_VALID(&ProcReadyList); \
+ SCHED_ENQUEUE_INTERNAL(proc); \
+ } while (0)
+
-/** Schedule to another process *without* adding the current to the ready list. */
-void proc_schedule(void);
+/// Schedule another process *without* adding the current one to the ready list.
+void proc_switch(void);
+
+#if CONFIG_KERN_PREEMPT
+void proc_entry(void (*user_entry)(void));
+void preempt_init(void);
+#endif
#if CONFIG_KERN_MONITOR
/** Initialize the monitor */
#if CONFIG_KERN_MONITOR
/** Initialize the monitor */
@@
-133,4
+156,3
@@
void proc_schedule(void);
#endif /* CONFIG_KERN_MONITOR */
#endif /* KERN_PROC_P_H */
#endif /* CONFIG_KERN_MONITOR */
#endif /* KERN_PROC_P_H */
-