adapt to new ABI

5 files changed, 25 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index ae187e0..8ac8f38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-KERNEL_DIR = ../q08
+KERNEL_DIR = ../litmus2008
 
 INC=-Iinclude/ -I${KERNEL_DIR}/include/
 
@@ -47,4 +47,4 @@ liblitmus.a:  ${LIB_OBJ} litmus.h
         ${AR} rcs liblitmus.a ${LIB_OBJ}
 
 check:
-        sparse ${CFLAGS} src/*.c bin/*.c
\ No newline at end of file
+        sparse ${CFLAGS} src/*.c bin/*.c
diff --git a/include/litmus.h b/include/litmus.h
index 6699213..ef39262 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -14,13 +14,13 @@ int get_rt_task_param(pid_t pid, struct rt_task* param);
 
 /* setup helper */
 /* times are givin in ms */
-int sporadic_task(unsigned long exec_cost, unsigned long period,
+int sporadic_task(lt_t e, lt_t p, lt_t phase,
                   int partition, task_class_t cls);
 
 #define sporadic_global(e, p) \
-        sporadic_task(e, p, 0, RT_CLASS_SOFT)
+        sporadic_task(e, p, 0, 0, RT_CLASS_SOFT)
 #define sporadic_partitioned(e, p, cpu) \
-        sporadic_task(e, p, cpu, RT_CLASS_SOFT)
+        sporadic_task(e, p, 0, cpu, RT_CLASS_SOFT)
 
 /* file descriptor attached shared objects support */
 typedef enum  {
@@ -74,4 +74,8 @@ task_class_t str2class(const char* str);
 void enter_np(void);
 void exit_np(void);
 
+/* task system support */
+int wait_for_ts_release(void);
+int release_ts(lt_t *delay);
+
 #endif
diff --git a/src/litmus.c b/src/litmus.c
index 4666471..4fe6572 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -29,7 +29,7 @@ task_class_t str2class(const char* str)
 
 #define NS_PER_MS 1000000
 
-int sporadic_task(unsigned long e, unsigned long p, 
+int sporadic_task(lt_t e, lt_t p, lt_t phase,
                   int cpu, task_class_t cls)
 {
         struct rt_task param;
@@ -37,6 +37,7 @@ int sporadic_task(unsigned long e, unsigned long p,
         param.period    = p * NS_PER_MS;
         param.cpu       = cpu;
         param.cls       = cls;
+        param.phase     = phase;
         return set_rt_task_param(gettid(), &param);
 }
 
diff --git a/src/syscalls.c b/src/syscalls.c
index 1ad709b..625d8b6 100644
--- a/src/syscalls.c
+++ b/src/syscalls.c
@@ -96,3 +96,13 @@ int sched_getscheduler(pid_t pid)
 {
         return syscall(__NR_sched_getscheduler, pid);
 }
+
+int wait_for_ts_release(void)
+{
+        return syscall(__NR_wait_for_ts_release);
+}
+
+int release_ts(lt_t *delay)
+{
+        return syscall(__NR_release_ts, delay);
+}
diff --git a/src/task.c b/src/task.c
index 0036efb..df12777 100644
--- a/src/task.c
+++ b/src/task.c
@@ -42,10 +42,11 @@ int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
                      task_class_t class)
 {
         struct rt_task params;
-        params.cpu = cpu;
-        params.period = period;
+        params.cpu       = cpu;
+        params.period    = period;
         params.exec_cost = wcet;
-        params.cls = class;
+        params.cls       = class;
+        params.phase     = 0;
         return __launch_rt_task(rt_prog, arg,
                                 (rt_setup_fn_t) set_rt_task_param, &params);
 }