reorganize liblitmus to be more modular

3 files changed, 61 insertions, 14 deletions

diff --git a/include/internal.h b/include/internal.h
new file mode 100644
index 0000000..25e1573
--- /dev/null
+++ b/include/internal.h
@@ -0,0 +1,21 @@
+#ifndef INTERNAL_H
+#define INTERNAL_H
+
+/* low level operations, not intended for API use */
+
+/* prepare a real-time task */
+typedef int (*rt_setup_fn_t)(int pid, void* arg);
+int __launch_rt_task(rt_fn_t rt_prog, void *rt_arg, 
+                     rt_setup_fn_t setup, void* setup_arg);
+
+#define check(str)       \
+        if (ret == -1) { \
+                perror(str); \
+                fprintf(stderr, \
+                        "Warning: Could not initialize LITMUS^RT, " \
+                        "%s failed.\n", str                         \
+                        ); \
+        }
+
+
+#endif
diff --git a/include/litmus.h b/include/litmus.h
index 925cb44..ff21963 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -126,12 +126,8 @@ int reg_ics_cb(struct ics_cb* ics_cb);
 int start_wcs(int od);
 
 /*  library functions */
-void init_litmus(void);
-/* exit is currently unused, but was needed for syscall
- * tracing and may be needed in the future. Leave it in
- * for the purpose of source code compatability.
- */
-#define exit_litmus() {}
+int  init_litmus(void);
+void exit_litmus(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, 
@@ -157,12 +153,4 @@ void exit_np(void);
  */
 int litmus_task_active();
 
-
-/* low level operations, not intended for API use */
-
-/* prepare a real-time task */
-typedef int (*rt_setup_fn_t)(int pid, void* arg);
-int __launch_rt_task(rt_fn_t rt_prog, void *rt_arg, 
-                     rt_setup_fn_t setup, void* setup_arg);
-
 #endif
diff --git a/include/syscalls.h b/include/syscalls.h
new file mode 100644
index 0000000..28f1a39
--- /dev/null
+++ b/include/syscalls.h
@@ -0,0 +1,38 @@
+#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