Added lock tracing, probably.

1 files changed, 24 insertions, 3 deletions

diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 249a96e1b73..6f4d4adcec0 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -428,7 +428,7 @@ struct dgl_semaphore {
      * it is impossible to have $>m$ boosted jobs.
      */
     bool boosted[NR_CPUS];
-    
+
     /* FIFO queue of waiting tasks */
     wait_queue_head_t wait;
 };
@@ -640,13 +640,20 @@ bool is_mask_valid(struct litmus_lock* l, resource_mask_t mask)
 
 }
 
+#define DGL_CONTAINER 1
+#define for_each_bit(field, idx)                                \
+        for (idx = find_first_bit(&field, sizeof(field)*8);     \
+             idx < sizeof(field)*8;                             \
+             idx = find_next_bit(&field, sizeof(field)*8, idx))
+
 int psnedf_dgl_dynamic_group_lock(struct litmus_lock* l, resource_mask_t resources)
 {
     struct task_struct* t = current;
     struct dgl_semaphore *sem = dgl_from_lock(l);
     wait_queue_t wait;
+    int resource;
     unsigned long flags;
-    
+
     TRACE_CUR("Trying to lock a DGL\n");
 
     if (!is_realtime(t))
@@ -695,6 +702,10 @@ int psnedf_dgl_dynamic_group_lock(struct litmus_lock* l, resource_mask_t resourc
         spin_unlock_irqrestore(&sem->wait.lock, flags);
     }
 
+    for_each_bit(resources, resource)
+            sched_trace_server_switch_to(resource, 0, t->pid, get_job_no(t),
+                                         get_partition(t));
+
     return 0;
 }
 
@@ -713,7 +724,7 @@ int psnedf_dgl_dynamic_group_unlock(struct litmus_lock* l, resource_mask_t resou
     struct task_struct *t = current, *tsk;
     struct dgl_semaphore *sem = dgl_from_lock(l);
     unsigned long flags;
-    int err = 0;
+    int err = 0, resource;
     resource_mask_t logically_locked;
     struct list_head *pos, *tmp;
 
@@ -784,6 +795,10 @@ int psnedf_dgl_dynamic_group_unlock(struct litmus_lock* l, resource_mask_t resou
         logically_locked = logically_locked | tsk->resources;
     }
 
+    for_each_bit(resources, resource)
+            sched_trace_server_switch_away(resource, 0, t->pid, get_job_no(t),
+                                           get_partition(t));
+
 out:
     spin_unlock_irqrestore(&sem->wait.lock, flags);
     return err;
@@ -840,6 +855,12 @@ static struct litmus_lock* psnedf_new_dgl(void)
     init_waitqueue_head(&sem->wait);
     sem->litmus_lock.ops = &psnedf_dgl_lock_ops;
     sem->litmus_lock.type = DGL_SEM;
+
+    sched_trace_container_param(DGL_CONTAINER, "dgl");
+    for (i = 0; i < sizeof(sem->dgl_resources)*8; ++i) {
+            sched_trace_server_param(i, DGL_CONTAINER, 0, 0);
+    }
+
     return &sem->litmus_lock;
 }