Merge branch 'mpi-master' into wip-2012.3-gpu

Conflicts:
	Makefile
	bin/rtspin.c
	include/litmus.h
	src/litmus.c

3 files changed, 117 insertions, 4 deletions

diff --git a/src/clocks.c b/src/clocks.c
index fcb94e5..74c2fb4 100644
--- a/src/clocks.c
+++ b/src/clocks.c
@@ -3,6 +3,8 @@
 #include <sys/time.h>
 #include <time.h>
 
+#include "litmus.h"
+
 /* CPU time consumed so far in seconds */
 double cputime(void)
 {
@@ -21,3 +23,12 @@ double wctime(void)
         gettimeofday(&tv, NULL);
         return (tv.tv_sec + 1E-6 * tv.tv_usec);
 }
+
+int lt_sleep(lt_t timeout)
+{
+        struct timespec delay;
+
+        delay.tv_sec  = timeout / 1000000000L;
+        delay.tv_nsec = timeout % 1000000000L;
+        return nanosleep(&delay, NULL);
+}
diff --git a/src/kernel_iface.c b/src/kernel_iface.c
index 33d56df..4cc1af5 100644
--- a/src/kernel_iface.c
+++ b/src/kernel_iface.c
@@ -12,6 +12,8 @@
 #define LITMUS_CTRL_DEVICE "/dev/litmus/ctrl"
 #define CTRL_PAGES 1
 
+#define LITMUS_STATS_FILE "/proc/litmus/stats"
+
 static int map_file(const char* filename, void **addr, size_t size)
 {
         int error = 0;
@@ -35,6 +37,43 @@ static int map_file(const char* filename, void **addr, size_t size)
         return error;
 }
 
+ssize_t read_file(const char* fname, void* buf, size_t maxlen)
+{
+        int fd;
+        ssize_t n = 0;
+        size_t got = 0;
+
+        fd = open(fname, O_RDONLY);
+        if (fd == -1)
+                return -1;
+
+        while (got < maxlen && (n = read(fd, buf + got, maxlen - got)) > 0)
+                got += n;
+        close(fd);
+        if (n < 0)
+                return -1;
+        else
+                return got;
+}
+
+int get_nr_ts_release_waiters(void)
+{
+        int ready = 0, all = 0;
+        char buf[100];
+        ssize_t len;
+
+        len = read_file(LITMUS_STATS_FILE, buf, sizeof(buf) - 1);
+        if (len >= 0)
+                len = sscanf(buf,
+                             "real-time tasks   = %d\n"
+                             "ready for release = %d\n",
+                             &all, &ready);
+        if (len == 2)
+                return ready;
+        else
+                return len;
+}
+
 /* thread-local pointer to control page */
 static __thread struct control_page *ctrl_page;
 
@@ -43,7 +82,16 @@ int init_kernel_iface(void)
         int err = 0;
         long page_size = sysconf(_SC_PAGESIZE);
 
-        BUILD_BUG_ON(sizeof(union np_flag) != sizeof(uint32_t));
+        BUILD_BUG_ON(sizeof(union np_flag) != sizeof(uint64_t));
+
+        BUILD_BUG_ON(offsetof(struct control_page, sched.raw)
+                     != LITMUS_CP_OFFSET_SCHED);
+        BUILD_BUG_ON(offsetof(struct control_page, irq_count)
+                     != LITMUS_CP_OFFSET_IRQ_COUNT);
+        BUILD_BUG_ON(offsetof(struct control_page, ts_syscall_start)
+                     != LITMUS_CP_OFFSET_TS_SC_START);
+        BUILD_BUG_ON(offsetof(struct control_page, irq_syscall_start)
+                     != LITMUS_CP_OFFSET_IRQ_SC_START);
 
         err = map_file(LITMUS_CTRL_DEVICE, (void**) &ctrl_page, CTRL_PAGES * page_size);
         if (err) {
diff --git a/src/litmus.c b/src/litmus.c
index 3bab483..c026af0 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -10,6 +10,55 @@
 #include "litmus.h"
 #include "internal.h"
 
+#define LP(name) {name ## _SEM, #name}
+
+static struct {
+        int id;
+        const char* name;
+} protocol[] = {
+        LP(FMLP),
+        LP(SRP),
+        LP(MPCP),
+        LP(MPCP_VS),
+        {MPCP_VS_SEM, "MPCP-VS"},
+        LP(DPCP),
+        LP(PCP),
+
+        {RSM_MUTEX, "RSM"},
+        LP(IKGLP),
+        LP(KFMLP),
+
+        {IKGLP_SIMPLE_GPU_AFF_OBS, "IKGLP-GPU-SIMPLE"},
+        {IKGLP_GPU_AFF_OBS, "IKGLP-GPU"},
+        {KFMLP_SIMPLE_GPU_AFF_OBS, "KFMLP-GPU-SIMPLE"},
+        {KFMLP_GPU_AFF_OBS, "KFMLP-GPU"},
+};
+
+#define NUM_PROTOS (sizeof(protocol)/sizeof(protocol[0]))
+
+int lock_protocol_for_name(const char* name)
+{
+        int i;
+
+        for (i = 0; i < NUM_PROTOS; i++)
+                if (strcmp(name, protocol[i].name) == 0)
+                        return protocol[i].id;
+
+        return -1;
+}
+
+const char* name_for_lock_protocol(int id)
+{
+        int i;
+
+        for (i = 0; i < NUM_PROTOS; i++)
+                if (protocol[i].id == id)
+                        return protocol[i].name;
+
+        return "<UNKNOWN>";
+}
+
+
 void show_rt_param(struct rt_task* tp)
 {
         printf("rt params:\n\t"
@@ -42,17 +91,20 @@ int be_migrate_to(int target_cpu)
 }
 
 int sporadic_task(lt_t e, lt_t p, lt_t phase,
-                  int cpu, task_class_t cls,
+                  int cpu, unsigned int priority,
+                  task_class_t cls,
                   budget_policy_t budget_policy,
                   budget_signal_policy_t budget_signal_policy,
                   int set_cpu_set)
 {
         return sporadic_task_ns(e * NS_PER_MS, p * NS_PER_MS, phase * NS_PER_MS,
-                                cpu, cls, budget_policy, budget_signal_policy, set_cpu_set);
+                                cpu, priority, cls, budget_policy, budget_signal_policy,
+                                set_cpu_set);
 }
 
 int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
-                        int cpu, task_class_t cls,
+                        int cpu, unsigned int priority,
+                        task_class_t cls,
                         budget_policy_t budget_policy,
                         budget_signal_policy_t budget_signal_policy,
                         int set_cpu_set)
@@ -67,11 +119,13 @@ int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
 
         param.exec_cost = e;
         param.period    = p;
+        param.relative_deadline = p; /* implicit deadline */
         param.cpu       = cpu;
         param.cls       = cls;
         param.phase     = phase;
         param.budget_policy = budget_policy;
         param.budget_signal_policy = budget_signal_policy;
+        param.priority  = priority;
 
         if (set_cpu_set) {
                 ret = be_migrate_to(cpu);