aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBjoern B. Brandenburg <bbb@cs.unc.edu>2011-07-28 01:16:04 -0400
committerBjoern B. Brandenburg <bbb@cs.unc.edu>2011-11-24 14:48:23 -0500
commit4d4ba58fca7753c1bbe56d43e7977f2a9601e772 (patch)
tree565aa066a95d207972801f0d9839df6433c3c376 /include
parentecf0549adc8b86c9daeee9eb4cd186fdec2aa21b (diff)
Switch to new np-section protocol.
Everything is in one 32-bit word now.
Diffstat (limited to 'include')
-rw-r--r--include/internal.h5
-rw-r--r--include/litmus.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/include/internal.h b/include/internal.h
index 07253b7..f30ce61 100644
--- a/include/internal.h
+++ b/include/internal.h
@@ -18,8 +18,13 @@ int __launch_rt_task(rt_fn_t rt_prog, void *rt_arg,
18 } 18 }
19 19
20 20
21/* taken from the kernel */
22
21#define likely(x) __builtin_expect((x), 1) 23#define likely(x) __builtin_expect((x), 1)
22#define unlikely(x) __builtin_expect((x), 0) 24#define unlikely(x) __builtin_expect((x), 0)
23 25
26#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
27#define BUILD_BUG_ON(condition) ((void)BUILD_BUG_ON_ZERO(condition))
28
24#endif 29#endif
25 30
diff --git a/include/litmus.h b/include/litmus.h
index 40ee124..4c85d28 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -96,6 +96,7 @@ task_class_t str2class(const char* str);
96/* non-preemptive section support */ 96/* non-preemptive section support */
97void enter_np(void); 97void enter_np(void);
98void exit_np(void); 98void exit_np(void);
99int requested_to_preempt(void);
99 100
100/* task system support */ 101/* task system support */
101int wait_for_ts_release(void); 102int wait_for_ts_release(void);