4 files changed, 36 insertions, 21 deletions

diff --git a/src/clocks.c b/src/clocks.c
new file mode 100644
index 0000000..fcb94e5
--- /dev/null
+++ b/src/clocks.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+
+#include <sys/time.h>
+#include <time.h>
+
+/* CPU time consumed so far in seconds */
+double cputime(void)
+{
+        struct timespec ts;
+        int err;
+        err = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
+        if (err != 0)
+                perror("clock_gettime");
+        return (ts.tv_sec + 1E-9 * ts.tv_nsec);
+}
+
+/* wall-clock time in seconds */
+double wctime(void)
+{
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+        return (tv.tv_sec + 1E-6 * tv.tv_usec);
+}
diff --git a/src/kernel_iface.c b/src/kernel_iface.c
index afb6202..1426795 100644
--- a/src/kernel_iface.c
+++ b/src/kernel_iface.c
@@ -8,7 +8,6 @@
 
 #include "litmus.h"
 #include "internal.h"
-#include "asm.h"
 
 #define LITMUS_CTRL_DEVICE "/dev/litmus/ctrl"
 #define CTRL_PAGES 1
@@ -66,7 +65,7 @@ void exit_np(void)
 {
         if (likely(ctrl_page != NULL) && --ctrl_page->np_flag == 0) {
                 /* became preemptive, let's check for delayed preemptions */
-                barrier();
+                __sync_synchronize();
                 if (ctrl_page->delayed_preemption)
                         sched_yield();
         }
diff --git a/src/litmus.c b/src/litmus.c
index 84e844c..fe63bad 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -80,7 +80,7 @@ int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
         param.period    = p;
         param.cpu       = cpu;
         param.cls       = cls;
-    param.crit      = crit;
+        param.crit      = crit;
         param.phase     = phase;
         param.budget_policy = budget_policy;
 
diff --git a/src/syscalls.c b/src/syscalls.c
index 77a6277..d800141 100644
--- a/src/syscalls.c
+++ b/src/syscalls.c
@@ -1,13 +1,16 @@
 /* To get syscall() we need to define _GNU_SOURCE
  * in modern glibc versions.
  */
+
+/* imported from the kernel source tree */
+#include "asm/unistd.h"
+
+/* for syscall() */
 #include <unistd.h>
-#include <linux/unistd.h>
-#include <sys/types.h>
 
-#include "litmus.h"
+//#include <sys/types.h>
 
-struct np_flag;
+#include "litmus.h"
 
 /*      Syscall stub for setting RT mode and scheduling options */
 
@@ -41,24 +44,14 @@ int od_close(int od)
         return syscall(__NR_od_close, od);
 }
 
-int fmlp_down(int od)
-{
-        return syscall(__NR_fmlp_down, od);
-}
-
-int fmlp_up(int od)
-{
-        return syscall(__NR_fmlp_up, od);
-}
-
-int srp_down(int od)
+int litmus_lock(int od)
 {
-        return syscall(__NR_srp_down, od);
+        return syscall(__NR_litmus_lock, od);
 }
 
-int srp_up(int od)
+int litmus_unlock(int od)
 {
-        return syscall(__NR_srp_up, od);
+        return syscall(__NR_litmus_unlock, od);
 }
 
 int get_job_no(unsigned int *job_no)