projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run_tests: Nicer output, configurable verbosity.
[bertos.git]
/
bertos
/
kern
/
proc_p.h
diff --git
a/bertos/kern/proc_p.h
b/bertos/kern/proc_p.h
index a0191d8301eaf44b4a1689d729f523a1150de725..0d6a94f153eed4102f2257defa18ed4f36eff9ce 100644
(file)
--- a/
bertos/kern/proc_p.h
+++ b/
bertos/kern/proc_p.h
@@
-34,7
+34,6
@@
* \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>
*/
* \author Bernie Innocenti <bernie@codewiz.org>
*/
@@
-46,7
+45,11
@@
#include <cpu/types.h> /* for cpu_stack_t */
#include <cpu/types.h> /* for cpu_stack_t */
-#include <mware/list.h>
+#include <struct/list.h>
+
+#if CONFIG_KERN_PREEMPTIVE
+ #include <ucontext.h> // XXX
+#endif
typedef struct Process
{
typedef struct Process
{
@@
-59,10
+62,6
@@
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
uint16_t flags; /**< Flags */
#endif
@@
-72,6
+71,10
@@
typedef struct Process
size_t stack_size; /**< Size of process stack */
#endif
size_t stack_size; /**< Size of process stack */
#endif
+#if CONFIG_KERN_PREEMPTIVE
+ ucontext_t context;
+#endif
+
#if CONFIG_KERN_MONITOR
struct ProcMonitor
{
#if CONFIG_KERN_MONITOR
struct ProcMonitor
{
@@
-110,14
+113,21
@@
extern REGISTER List ProcReadyList;
* might vary to implement a different scheduling algorithms.
*
* \note This macro is *NOT* protected against the scheduler. Access to
* 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()
+ * this list must be performed with interrupts disabled.
*/
*/
-#define SCHED_ENQUEUE(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+#define SCHED_ENQUEUE(proc) do { \
+ LIST_ASSERT_VALID(&ProcReadyList); \
+ ADDTAIL(&ProcReadyList, &(proc)->link); \
+ } while (0)
/** Schedule to another process *without* adding the current to the ready list. */
void proc_schedule(void);
/** Schedule to another process *without* adding the current to the ready list. */
void proc_schedule(void);
+#if CONFIG_KERN_PREEMPT
+void proc_entry(void (*user_entry)(void));
+void preempt_init(void);
+#endif
+
#if CONFIG_KERN_MONITOR
/** Initialize the monitor */
void monitor_init(void);
#if CONFIG_KERN_MONITOR
/** Initialize the monitor */
void monitor_init(void);
@@
-133,4
+143,3
@@
void proc_schedule(void);
#endif /* CONFIG_KERN_MONITOR */
#endif /* KERN_PROC_P_H */
#endif /* CONFIG_KERN_MONITOR */
#endif /* KERN_PROC_P_H */
-