Merge branch 'gh/staging' into temp

Conflicts:
	Makefile
	bin/rt_launch.c
	bin/rtspin.c
	src/task.c

4 files changed, 57 insertions, 34 deletions

diff --git a/src/kernel_iface.c b/src/kernel_iface.c
index 4cc1af5..e446102 100644
--- a/src/kernel_iface.c
+++ b/src/kernel_iface.c
@@ -56,9 +56,8 @@ ssize_t read_file(const char* fname, void* buf, size_t maxlen)
                 return got;
 }
 
-int get_nr_ts_release_waiters(void)
+int read_litmus_stats(int *ready, int *all)
 {
-        int ready = 0, all = 0;
         char buf[100];
         ssize_t len;
 
@@ -67,11 +66,17 @@ int get_nr_ts_release_waiters(void)
                 len = sscanf(buf,
                              "real-time tasks   = %d\n"
                              "ready for release = %d\n",
-                             &all, &ready);
-        if (len == 2)
+                             all, ready);
+        return len == 2;
+}
+
+int get_nr_ts_release_waiters(void)
+{
+        int ready, all;
+        if (read_litmus_stats(&ready, &all))
                 return ready;
         else
-                return len;
+                return -1;
 }
 
 /* thread-local pointer to control page */
diff --git a/src/litmus.c b/src/litmus.c
index ba47e45..7cdffcc 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -3,7 +3,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
+#include <fcntl.h>
 #include <sys/mman.h>
+#include <sys/types.h>
+
 
 #include <sched.h> /* for cpu sets */
 
@@ -32,7 +35,7 @@ static struct {
         {IKGLP_GPU_AFF_OBS, "IKGLP-GPU"},
         {KFMLP_SIMPLE_GPU_AFF_OBS, "KFMLP-GPU-SIMPLE"},
         {KFMLP_GPU_AFF_OBS, "KFMLP-GPU"},
-        
+
         {PRIOQ_MUTEX, "PRIOQ"},
 };
 
@@ -60,6 +63,23 @@ const char* name_for_lock_protocol(int id)
         return "<UNKNOWN>";
 }
 
+int litmus_open_lock(
+        obj_type_t protocol,
+        int lock_id,
+        const char* namespace,
+        void *config_param)
+{
+        int fd, od;
+
+        fd = open(namespace, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+        if (fd < 0)
+                return -1;
+        od = od_openx(fd, protocol, lock_id, config_param);
+        close(fd);
+        return od;
+}
+
+
 
 void show_rt_param(struct rt_task* tp)
 {
@@ -171,7 +191,7 @@ int open_kfmlp_gpu_sem(int fd, int name,
         unsigned int num_replicas;
         struct gpu_affinity_observer_args aff_args;
         int aff_type;
-        
+
         // number of GPU tokens
         num_replicas = num_gpus * rho;
 
@@ -181,20 +201,20 @@ int open_kfmlp_gpu_sem(int fd, int name,
                 perror("open_kfmlp_sem");
                 return -1;
         }
-        
+
         // create the affinity method to use.
         // "no affinity" -> KFMLP_SIMPLE_GPU_AFF_OBS
         aff_args.obs.lock_od = lock_od;
         aff_args.replica_to_gpu_offset = gpu_offset;
         aff_args.rho = rho;
-        
+
         aff_type = (affinity_aware) ? KFMLP_GPU_AFF_OBS : KFMLP_SIMPLE_GPU_AFF_OBS;
         affinity_od = od_openx(fd, aff_type, name+1, &aff_args);
         if(affinity_od < 0) {
                 perror("open_kfmlp_aff");
                 return -1;
-        }       
-        
+        }
+
         return lock_od;
 }
 
@@ -209,28 +229,28 @@ int open_kfmlp_gpu_sem(int fd, int name,
 //
 //      // number of GPU tokens
 //      num_replicas = num_gpus * num_simult_users;
-//      
+//
 //      // create the GPU token lock
 //      lock_od = open_ikglp_sem(fd, name, (void*)&num_replicas);
 //      if(lock_od < 0) {
 //              perror("open_ikglp_sem");
 //              return -1;
 //      }
-//      
+//
 //      // create the affinity method to use.
 //      // "no affinity" -> KFMLP_SIMPLE_GPU_AFF_OBS
 //      aff_args.obs.lock_od = lock_od;
 //      aff_args.replica_to_gpu_offset = gpu_offset;
 //      aff_args.nr_simult_users = num_simult_users;
 //      aff_args.relaxed_rules = (relax_max_fifo_len) ? 1 : 0;
-//      
+//
 //      aff_type = (affinity_aware) ? IKGLP_GPU_AFF_OBS : IKGLP_SIMPLE_GPU_AFF_OBS;
 //      affinity_od = od_openx(fd, aff_type, name+1, &aff_args);
 //      if(affinity_od < 0) {
 //              perror("open_ikglp_aff");
 //              return -1;
-//      }       
-//      
+//      }
+//
 //      return lock_od;
 //}
 
@@ -243,7 +263,7 @@ int open_ikglp_sem(int fd, int name, unsigned int nr_replicas)
                 .nr_replicas = nr_replicas,
                 .max_in_fifos = IKGLP_M_IN_FIFOS,
                 .max_fifo_len = IKGLP_OPTIMAL_FIFO_LEN};
-        
+
         return od_openx(fd, IKGLP_SEM, name, &args);
 }
 
@@ -257,7 +277,7 @@ int open_gpusync_token_lock(int fd, int name,
 {
         int lock_od;
         int affinity_od;
-        
+
         struct ikglp_args args = {
                 .nr_replicas = num_gpus*rho,
                 .max_in_fifos = max_in_fifos,
@@ -265,41 +285,37 @@ int open_gpusync_token_lock(int fd, int name,
         };
         struct gpu_affinity_observer_args aff_args;
         int aff_type;
-        
+
         if (!num_gpus || !rho) {
                 perror("open_gpusync_sem");
                 return -1;
         }
-        
+
         if ((max_in_fifos != IKGLP_UNLIMITED_IN_FIFOS) &&
                 (max_fifo_len != IKGLP_UNLIMITED_FIFO_LEN) &&
                 (max_in_fifos > args.nr_replicas * max_fifo_len)) {
                 perror("open_gpusync_sem");
                 return(-1);
         }
-        
+
         lock_od = od_openx(fd, IKGLP_SEM, name, &args);
         if(lock_od < 0) {
                 perror("open_gpusync_sem");
                 return -1;
         }
-        
+
         // create the affinity method to use.
         aff_args.obs.lock_od = lock_od;
         aff_args.replica_to_gpu_offset = gpu_offset;
         aff_args.rho = rho;
         aff_args.relaxed_rules = (max_fifo_len == IKGLP_UNLIMITED_FIFO_LEN) ? 1 : 0;
-        
+
         aff_type = (enable_affinity_heuristics) ? IKGLP_GPU_AFF_OBS : IKGLP_SIMPLE_GPU_AFF_OBS;
         affinity_od = od_openx(fd, aff_type, name+1, &aff_args);
         if(affinity_od < 0) {
                 perror("open_gpusync_affinity");
                 return -1;
         }
-        
+
         return lock_od;
 }
-
-
-
-
diff --git a/src/signal.c b/src/signal.c
index bfe18b9..397a797 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -28,7 +28,7 @@ static void reg_litmus_signals(unsigned long litmus_sig_mask,
 {
         int ret;
 
-        if (litmus_sig_mask | SIG_BUDGET_MASK) { 
+        if (litmus_sig_mask | SIG_BUDGET_MASK) {
                 ret = sigaction(SIG_BUDGET, pAction, NULL);
                 check("SIG_BUDGET");
         }
diff --git a/src/task.c b/src/task.c
index 26fc15a..9317cc7 100644
--- a/src/task.c
+++ b/src/task.c
@@ -40,15 +40,16 @@ int __launch_rt_task(rt_fn_t rt_prog, void *rt_arg, rt_setup_fn_t setup,
         return rt_task;
 }
 
-int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
-                     task_class_t rt_class)
+int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, lt_t wcet, lt_t period,
+                     unsigned int priority, task_class_t cls)
 {
         struct rt_task params;
         params.cpu       = cpu;
         params.period    = period;
         params.exec_cost = wcet;
-        params.cls       = rt_class;
+        params.cls       = cls;
         params.phase     = 0;
+        params.priority = priority;
         /* enforce budget for tasks that might not use sleep_next_period() */
         params.budget_policy = QUANTUM_ENFORCEMENT;
 
@@ -56,8 +57,9 @@ int __create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, int wcet, int period,
                                 (rt_setup_fn_t) set_rt_task_param, &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);
+int create_rt_task(rt_fn_t rt_prog, void *arg, int cpu, lt_t wcet, lt_t period,
+                   unsigned int priority) {
+        return __create_rt_task(rt_prog, arg, cpu, wcet, period, priority, RT_CLASS_HARD);
 }