many changes

 - use declarations from kernel
 - get rid of stuipd system call macros

7 files changed, 100 insertions, 145 deletions

diff --git a/Makefile b/Makefile
index 2164d23..38af7fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
-CFLAGS=-Wall -Wdeclaration-after-statement  -g -Iinclude/ -D_XOPEN_SOURCE=600
+KERNEL_DIR = ../litmus
+
+INC=-Iinclude/ -I${KERNEL_DIR}/include/
+
+CFLAGS=-Wall -Wdeclaration-after-statement ${INC} -g  -D_XOPEN_SOURCE=600
 CPPFLAGS=-Wall -g
 
 LIBS= ./liblitmus.a
@@ -41,4 +45,3 @@ stdump: liblitmus.a litmus.h sched_trace.h stdump.o
 
 liblitmus.a:  ${LIB_OBJ} litmus.h 
         ${AR} rcs liblitmus.a ${LIB_OBJ}
-
diff --git a/bin/base_mt_task.c b/bin/base_mt_task.c
index 24f2070..a1e3731 100644
--- a/bin/base_mt_task.c
+++ b/bin/base_mt_task.c
@@ -121,7 +121,6 @@ int main(int argc, char** argv)
 void* rt_thread(struct thread_context* ctx)
 {
         int do_exit;
-        rt_param_t param;
 
         /* Make presence visible. */
         printf("RT Thread %d active.\n", ctx->id);
@@ -132,10 +131,6 @@ void* rt_thread(struct thread_context* ctx)
         CALL( init_rt_thread() );
         CALL( sporadic_global(EXEC_COST, PERIOD) );
 
-        /* Just for fun display the real-time parameters of this thread. */
-        CALL( get_rt_task_param(gettid(), &param) );
-        show_rt_param(&param);
-
         /*****
          * 2) Transition to real-time mode.
          */
diff --git a/include/litmus.h b/include/litmus.h
index 8918ae9..cf39f80 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -1,41 +1,16 @@
 #ifndef LITMUS_H
 #define LITMUS_H
 
+#include <linux/rt_param.h>
 #include <sys/types.h>
 
-/* A real-time program. */
-typedef int (*rt_fn_t)(void*);
-
-/* different types of clients */
-typedef enum {
-        RT_CLASS_HARD,  
-        RT_CLASS_SOFT,
-        RT_CLASS_BEST_EFFORT
-} task_class_t;
-
-/*      Task RT params for schedulers */
-/*      RT task parameters for scheduling extensions    
-*       These parameters are inherited during clone and therefore must
-*       be explicitly set up before the task set is launched.
-*/
-typedef struct rt_param {       
-        /*      Execution cost  */
-        unsigned long exec_cost;        
-        /*      Period          */
-        unsigned long period;                   
-        /*      Partition       */
-        unsigned int cpu;
-        /*      type of task    */
-        task_class_t    cls;
-} rt_param_t;
-
 typedef int pid_t;       /* PID of a task */
 
 /* obtain the PID of a thread */
 pid_t gettid(void);
 
-int set_rt_task_param(pid_t pid, rt_param_t* param);
-int get_rt_task_param(pid_t pid, rt_param_t* param);
+int set_rt_task_param(pid_t pid, struct rt_task* param);
+int get_rt_task_param(pid_t pid, struct rt_task* param);
 
 /* setup helper */
 int sporadic_task(unsigned long exec_cost, unsigned long period, 
@@ -77,6 +52,9 @@ int  init_litmus(void);
 int  init_rt_thread(void);
 void exit_litmus(void);
 
+/* A real-time program. */
+typedef int (*rt_fn_t)(void*);
+
 int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period);
 int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, 
                      int period, task_class_t cls);
@@ -88,7 +66,7 @@ enum rt_task_mode_t {
 };
 int task_mode(int target_mode);
 
-void show_rt_param(rt_param_t* tp);
+void show_rt_param(struct rt_task* tp);
 task_class_t str2class(const char* str);
 
 /* non-preemptive section support */
diff --git a/include/syscalls.h b/include/syscalls.h
deleted file mode 100644
index 28f1a39..0000000
--- a/include/syscalls.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef SYSCALLS_H
-#define SYSCALLS_H
-
-/* this is missing in newer linux/unistd.h versions */
-
-#define _syscall0(type,name) \
-type name(void) \
-{\
-        return syscall(__NR_##name);\
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{\
-        return syscall(__NR_##name, arg1);\
-}
-
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{\
-        return syscall(__NR_##name, arg1, arg2);\
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)   \
-type name(type1 arg1,type2 arg2, type3 arg3)   \
-{\
-        return syscall(__NR_##name, arg1, arg2, arg3);  \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
-type name(type1 arg1,type2 arg2, type3 arg3, type4 arg4)                \
-{\
-        return syscall(__NR_##name, arg1, arg2, arg3, arg4);    \
-}
-
-
-#endif
diff --git a/src/litmus.c b/src/litmus.c
index 8f5dfe8..6503088 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -8,10 +8,10 @@
 #include "litmus.h"
 #include "internal.h"
 
-void show_rt_param(rt_param_t* tp) 
+void show_rt_param(struct rt_task* tp) 
 {
         printf("rt params:\n\t"
-               "exec_cost:\t%ld\n\tperiod:\t\t%ld\n\tcpu:\t%d\n",
+               "exec_cost:\t%llu\n\tperiod:\t\t%llu\n\tcpu:\t%d\n",
                tp->exec_cost, tp->period, tp->cpu);
 }
 
@@ -30,11 +30,11 @@ task_class_t str2class(const char* str)
 int sporadic_task(unsigned long e, unsigned long p, 
                   int cpu, task_class_t cls)
 {
-        rt_param_t param;
+        struct rt_task param;
         param.exec_cost = e;
         param.period    = p;
         param.cpu       = cpu;
-        param.cls       = cls;
+        param.cls      = cls;
         return set_rt_task_param(gettid(), &param);
 }
 
diff --git a/src/syscalls.c b/src/syscalls.c
index 0924818..40f5f7f 100644
--- a/src/syscalls.c
+++ b/src/syscalls.c
@@ -8,53 +8,87 @@
 
 #include "litmus.h"
 
-#include "syscalls.h"
-
 struct np_flag;
 
-/*      Litmus syscalls definitions */
-#define __NR_sched_setpolicy    320
-#define __NR_sched_getpolicy    321
-#define __NR_set_rt_mode        322
-#define __NR_set_rt_task_param  323
-#define __NR_get_rt_task_param  324
-#define __NR_sleep_next_period  326
-#define __NR_scheduler_setup    327
-#define __NR_register_np_flag   328
-#define __NR_signal_exit_np     329