Some debuging traces.

2 files changed, 12 insertions, 7 deletions

diff --git a/litmus/locking.c b/litmus/locking.c
index 665eef30fe0..1d46d148e9e 100644
--- a/litmus/locking.c
+++ b/litmus/locking.c
@@ -70,7 +70,11 @@ asmlinkage long sys_dynamic_group_lock(resource_mask_t lock_ods)
         l = get_lock(entry);
         if (l->type == DGL_SEM){
             err = l->ops->dynamic_group_lock(l, lock_ods);
+        }else{
+            TRACE("Attempted to DG-lock type: %d\n", l->type);
         }
+    } else {
+        TRACE_CUR("Attempted to lock invalid entry %d\n", entry);
     }
 
     TS_LOCK_END;
@@ -92,8 +96,10 @@ asmlinkage long sys_dynamic_group_unlock(resource_mask_t lock_ods)
         if (l->type == DGL_SEM){
             err = l->ops->dynamic_group_unlock(l, lock_ods);
         } else{
-            TRACE_CUR("Wrong Type: %d\n", l->type);
+            TRACE_CUR("Attempted to DG-unlock type: %d\n", l->type);
         }
+    } else {
+        TRACE_CUR("Attempted to unlock invalid entry %d\n", entry);
     }
 
     TS_UNLOCK_END;
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 451433c9d54..249a96e1b73 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -273,7 +273,7 @@ static struct task_struct* psnedf_schedule(struct task_struct * prev)
 
         if (next) {
                 STRACE_TASK(next, "scheduled at %llu\n", litmus_clock());
-                set_rt_flags(next, RT_F_RUNNING);
+                tsk_rt(next)->completed = 0;
         } else {
                 STRACE("becoming idle at %llu\n", litmus_clock());
         }
@@ -761,10 +761,10 @@ int psnedf_dgl_dynamic_group_unlock(struct litmus_lock* l, resource_mask_t resou
             break;
         }
 
-        STRACE_TASK(tsk, "Logically locked: %o\n", logically_locked);
-        STRACE_TASK(tsk, "tsk->resources: %o\n", tsk->resources);
-        STRACE_TASK(tsk, "!(tsk->resources & logically_locked): %o\n", !(tsk->resources & logically_locked));
-        STRACE_TASK(tsk, "!sem->boosted: %d\n", !sem->boosted[task_cpu(tsk)]);
+        //STRACE_TASK(tsk, "Logically locked: %o\n", logically_locked);
+        //STRACE_TASK(tsk, "tsk->resources: %o\n", tsk->resources);
+        //STRACE_TASK(tsk, "!(tsk->resources & logically_locked): %o\n", !(tsk->resources & logically_locked));
+        //STRACE_TASK(tsk, "!sem->boosted: %d\n", !sem->boosted[task_cpu(tsk)]);
 
         // the resources requested are unlocked, tsk acquires its resources
         if( !(tsk->resources & logically_locked) && !sem->boosted[task_cpu(tsk)]) {
@@ -834,7 +834,6 @@ static struct litmus_lock* psnedf_new_dgl(void)
     sem->locked = 0;
     sem->dgl_resources = 0;
 
-    // This doesn't feel like the preferred way to do it, but it should work.
     for(i = 0; i < NR_CPUS; i++)
         sem->boosted[i] = false;