aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2011-03-31 11:59:28 -0400
committerGlenn Elliott <gelliott@cs.unc.edu>2011-03-31 11:59:28 -0400
commit26094304c72ab8d2488412df990dd966c60c5a02 (patch)
tree420400b9a5e8e67e43f9c55b88ef9ba285bf674a
parent5b9fde02ba7291f747cf64927e721080fd7ef76a (diff)
parentaee0e7c1385751aa92c04b993fec570552c2669a (diff)
Merge branch 'wip-k-fmlp' into wip-kernsthreads-nv
-rw-r--r--include/litmus.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/litmus.h b/include/litmus.h
index a1ee59f..d45cbd0 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -49,7 +49,8 @@ int sporadic_task_ns(
49/* file descriptor attached shared objects support */ 49/* file descriptor attached shared objects support */
50typedef enum { 50typedef enum {
51 FMLP_SEM = 0, 51 FMLP_SEM = 0,
52 SRP_SEM = 1, 52 KFMLP_SEM = 1,
53 SRP_SEM = 2,
53} obj_type_t; 54} obj_type_t;
54 55
55int od_openx(int fd, obj_type_t type, int obj_id, void* config); 56int od_openx(int fd, obj_type_t type, int obj_id, void* config);
@@ -128,6 +129,10 @@ static inline int open_srp_sem(int fd, int name)
128 return od_open(fd, SRP_SEM, name); 129 return od_open(fd, SRP_SEM, name);
129} 130}
130 131
132static inline int open_kfmlp_sem(int fd, int name, void* arg)
133{
134 return od_openx(fd, KFMLP_SEM, name, arg);
135}
131 136
132/* syscall overhead measuring */ 137/* syscall overhead measuring */
133int null_call(cycles_t *timestamp); 138int null_call(cycles_t *timestamp);