Final RTSS version

5 files changed, 18 insertions, 9 deletions

diff --git a/litmus/fifo_lock.c b/litmus/fifo_lock.c
index ebb915621e9c..7bd6dafeb9fa 100644
--- a/litmus/fifo_lock.c
+++ b/litmus/fifo_lock.c
@@ -330,6 +330,7 @@ int fifo_mutex_unlock(struct litmus_lock* l)
         int err = 0;
 
         if (mutex->owner != t) {
+                TRACE_TASK(t, "does not hold fifo mutex %d\n", l->ident);
                 err = -EINVAL;
                 return err;
         }
diff --git a/litmus/gpu_affinity.c b/litmus/gpu_affinity.c
index 3e76cd1e2291..e59814b998d3 100644
--- a/litmus/gpu_affinity.c
+++ b/litmus/gpu_affinity.c
@@ -16,8 +16,8 @@
 //#define HI_THRESHOLD 2
 //#define LO_THRESHOLD 4
 
-#define NUM_STDEV_NUM   3
-#define NUM_STDEV_DENOM 2
+#define NUM_STDEV_NUM   2
+#define NUM_STDEV_DENOM 1
 
 #define MIN(a, b) ((a < b) ? a : b)
 
diff --git a/litmus/ikglp_lock.c b/litmus/ikglp_lock.c
index 71d3c3392b16..b7ed08be3744 100644
--- a/litmus/ikglp_lock.c
+++ b/litmus/ikglp_lock.c
@@ -937,6 +937,7 @@ static void __ikglp_enqueue_on_fq(struct ikglp_semaphore *sem,
 
         wait->cur_q = IKGLP_FQ;
         wait->fq = fq;
+        mb();
 
         TRACE_TASK(t, "shortest queue is now %d\n", ikglp_get_idx(sem, fq));
 }
@@ -1250,8 +1251,6 @@ int ikglp_lock(struct litmus_lock* l)
 
         fq = wait.fq;
 
-        BUG_ON(fq != ikglp_get_queue(sem, t));
-
         tsk_rt(t)->blocked_lock_data = 0;
 
         replica = ikglp_get_idx(sem, fq);
@@ -1825,6 +1824,7 @@ int ikglp_unlock(struct litmus_lock* l)
         fq = ikglp_get_queue(sem, t);  // returns NULL if 't' is not owner.
 
         if (!fq) {
+                TRACE_TASK(t, "does not hold a replica of lock %d\n", l->ident);
                 err = -EINVAL;
                 goto out;
         }
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 924853c82343..ceaa31405884 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -93,6 +93,7 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
         printk("Setting up rt task parameters for process %d.\n", pid);
 
         if (pid < 0 || param == 0) {
+                printk("Invalid pid or NULL params\n");
                 goto out;
         }
         if (copy_from_user(&tp, param, sizeof(tp))) {
@@ -119,12 +120,18 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
         if (tp.relative_deadline == 0)
                 tp.relative_deadline = tp.period;
 
-        if (tp.exec_cost <= 0)
+        if (tp.exec_cost <= 0) {
+                printk(KERN_INFO "invalid execution cost\n");
                 goto out_unlock;
-        if (tp.period <= 0)
+        }
+        if (tp.period <= 0) {
+                printk(KERN_INFO "invalid period\n");
                 goto out_unlock;
-        if (!cpu_online(tp.cpu))
+        }
+        if (!cpu_online(tp.cpu)) {
+                printk(KERN_INFO "requested CPU is offline.\n");
                 goto out_unlock;
+        }
         if (min(tp.relative_deadline, tp.period) < tp.exec_cost) /*density check*/
         {
                 printk(KERN_INFO "litmus: real-time task %d rejected "
diff --git a/litmus/locking.c b/litmus/locking.c
index f1673535f114..513b5d3844c8 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -943,8 +943,9 @@ int wake_up_for_lock(struct task_struct* t)
 int flush_pending_wakes()
 {
         int count = 0, i;
-        
-        wake_queue_t *q = &per_cpu(wqueues, smp_processor_id());
+        wake_queue_t *q;
+
+        q = &per_cpu(wqueues, smp_processor_id());
         for(i = 0; i < q->count; ++i)
         {
                 if (q->to_wake[i]) {