reorganize liblitmus to be more modular

5 files changed, 212 insertions, 216 deletions

diff --git a/src/adaptive.c b/src/adaptive.c
index ebf662d..6a7d7a2 100644
--- a/src/adaptive.c
+++ b/src/adaptive.c
@@ -2,6 +2,9 @@
 #include <unistd.h>
 
 #include "litmus.h"
+#include "internal.h"
+#include "syscalls.h"
+
 #include "adaptive.h"
 
 #define __NR_set_service_levels         346
diff --git a/src/kernel_iface.c b/src/kernel_iface.c
new file mode 100644
index 0000000..5751ca6
--- /dev/null
+++ b/src/kernel_iface.c
@@ -0,0 +1,61 @@
+#include <stdio.h>
+
+#include "litmus.h"
+#include "internal.h"
+
+struct np_flag {
+        #define RT_PREEMPTIVE           0x2050 /* = NP */
+        #define RT_NON_PREEMPTIVE       0x4e50 /* =  P */
+        unsigned short preemptivity;
+
+        #define RT_EXIT_NP_REQUESTED    0x5251 /* = RQ */
+        unsigned short request;
+
+        unsigned int ctr;
+};
+
+int register_np_flag(struct np_flag* flag);
+int signal_exit_np(void);
+
+
+
+static struct np_flag np_flag;
+
+
+int init_kernel_iface(void)
+{
+        int ret;
+        np_flag.preemptivity = RT_PREEMPTIVE;
+        np_flag.ctr = 0;
+        ret = register_np_flag(&np_flag);
+        check("register_np_flag()");  
+        return ret;
+}
+
+static inline void barrier(void)
+{
+        __asm__ __volatile__("sfence": : :"memory");
+}
+
+void enter_np(void)
+{
+        if (++np_flag.ctr == 1)
+        {
+                np_flag.request = 0;
+                barrier();
+                np_flag.preemptivity = RT_NON_PREEMPTIVE;
+        }
+}
+
+
+void exit_np(void)
+{
+        if (--np_flag.ctr == 0)
+        {
+                np_flag.preemptivity = RT_PREEMPTIVE;
+                barrier();
+                if (np_flag.request == RT_EXIT_NP_REQUESTED)
+                        signal_exit_np();
+        }
+}
+
diff --git a/src/litmus.c b/src/litmus.c
index 531f501..4005345 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -1,53 +1,12 @@
-/* To get syscall() we need to define _GNU_SOURCE 
- * in modern glibc versions.
- */
-#define _GNU_SOURCE
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
-#include <errno.h>
 #include <signal.h>
 #include <sys/mman.h>
 
-
-
 #include "litmus.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);    \
-}
+#include "internal.h"
 
 const char* get_scheduler_name(spolicy scheduler) 
 {
@@ -85,71 +44,6 @@ const char* get_scheduler_name(spolicy scheduler)
         return name;
 }
 
-static void tperrorx(char* msg) 
-{
-        fprintf(stderr, 
-                "Task %d: %s: %m",
-                getpid(), msg);
-        exit(-1);
-}
-
-/* common launch routine */
-int __launch_rt_task(rt_fn_t rt_prog, void *rt_arg, rt_setup_fn_t setup, 
-                     void* setup_arg) 
-{
-        int ret;
-        int rt_task = fork();
-
-        if (rt_task == 0) {
-                /* we are the real-time task 
-                 * launch task and die when it is done
-                 */             
-                rt_task = getpid();             
-                ret = setup(rt_task, setup_arg);
-                if (ret < 0)
-                        tperrorx("could not setup task parameters");
-                ret = task_mode(LITMUS_RT_TASK);
-                if (ret < 0)
-                        tperrorx("could not become real-time task");
-                exit(rt_prog(rt_arg));
-        }
-
-        return rt_task;
-}
-
-struct create_rt_param {
-        int cpu;
-        int wcet;
-        int period;
-        task_class_t class;
-};
-
-int setup_create_rt(int pid, struct create_rt_param* arg)
-{
-        rt_param_t params;
-        params.period      = arg->period;
-        params.exec_cost   = arg->wcet;
-        params.cpu         = arg->cpu;
-        params.cls         = arg->class;
-        return set_rt_task_param(pid, &params);
-}
-
-int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
-                     task_class_t class) 
-{
-        struct create_rt_param params;
-        params.cpu = cpu;
-        params.period = period;
-        params.wcet = wcet;
-        params.class = class;
-        return __launch_rt_task(rt_prog, arg, 
-                                (rt_setup_fn_t) setup_create_rt, &params);
-}
-
-int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period) {
-        return __create_rt_task(rt_prog, arg, cpu, wcet, period, RT_CLASS_HARD);
-}
-
 
 void show_rt_param(rt_param_t* tp) 
 {
@@ -181,49 +75,6 @@ int sporadic_task(unsigned long e, unsigned long p,
         return set_rt_task_param(getpid(), &param);
 }
 
-struct np_flag {
-        #define RT_PREEMPTIVE           0x2050 /* = NP */
-        #define RT_NON_PREEMPTIVE       0x4e50 /* =  P */
-        unsigned short preemptivity;
-
-        #define RT_EXIT_NP_REQUESTED    0x5251 /* = RQ */
-        unsigned short request;
-