Output additional data in MC completion records.

6 files changed, 38 insertions, 24 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 2a5cdecb4f46..42f5b4f66a3d 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -277,6 +277,8 @@ struct rt_param {
 
         lt_t load;
         lt_t flush;
+        int load_work;
+        int flush_work;
 
         lt_t max_exec_time;
         lt_t tot_exec_time;
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 2f15da3c9e36..cb8758f8aebf 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -52,7 +52,9 @@ struct st_switch_away_data {	/* A process was switched away from on a given CPU.
 };
 
 struct st_completion_data {     /* A job completed. */
-        u64     when;
+        u32     exec;
+        u16     flush_work;
+        u16     load_work;
         u32     flush;
         u32     load;
         /* u8   forced:1;       /\* Set to 1 if job overran and kernel advanced to the */
diff --git a/kernel/sched.c b/kernel/sched.c
index 2739b3339ffb..b71190c2540f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4337,10 +4337,6 @@ need_resched:
          * if the previous one is no longer valid after CTX.
          */
 litmus_need_resched_nonpreemptible:
-        TS_SCHED_START;
-        TS_LVLA_SCHED_START;
-        TS_LVLB_SCHED_START;
-        TS_LVLC_SCHED_START;
         sched_trace_task_switch_away(prev);
 
         schedule_debug(prev);
@@ -4399,10 +4395,6 @@ litmus_need_resched_nonpreemptible:
                 rq->curr = next;
                 ++*switch_count;
 
-                TS_LVLA_SCHED_END(next);
-                TS_LVLB_SCHED_END(next);
-                TS_LVLC_SCHED_END(next);
-                TS_SCHED_END(next);
                 TS_CXS_START(next);
                 context_switch(rq, prev, next); /* unlocks the rq */
                 TS_CXS_END(current);
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 098ea000f5de..816361f9f177 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -58,20 +58,20 @@ static void do_release(struct release_heap *rh)
 {
         unsigned long flags;
 
+        TS_RELEASE_LATENCY(rh->release_time);
+
 #ifdef CONFIG_PLUGIN_MC
         if (CRIT_LEVEL_B == rh->dom->level)  {
                 TS_LVLB_RELEASE_START;
         } else {
                 TS_LVLC_RELEASE_START;
         }
+#else
+        TS_RELEASE_START;
 #endif
 
-        TS_RELEASE_LATENCY(rh->release_time);
-
         VTRACE("on_release_timer starts.\n");
 
-        TS_RELEASE_START;
-
         raw_spin_lock_irqsave(&rh->dom->release_lock, flags);
         VTRACE("CB has the release_lock 0x%p\n", &rh->dom->release_lock);
         /* remove from release queue */
@@ -88,6 +88,8 @@ static void do_release(struct release_heap *rh)
         } else {
                 TS_LVLC_RELEASE_END;
         }
+#else
+        TS_RELEASE_END;
 #endif
 }
 
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index d7965aeda4c4..22d3d376d7d4 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -1289,7 +1289,7 @@ static void process_signals(struct cpu_entry *entry)
 static struct task_struct* mc_schedule(struct task_struct* prev)
 {
         lt_t start;
-        int out_of_time, sleep, preempt, exists, blocks, global, lower;
+        int out_of_time, sleep, preempt, exists, blocks, global, lower, work;
         struct cpu_entry* entry = &__get_cpu_var(cpus);
         struct task_struct *next = NULL;
 
@@ -1302,6 +1302,20 @@ static struct task_struct* mc_schedule(struct task_struct* prev)
                 low_prio_arrival(entry->will_schedule);
         }
 
+
+        if (prev && tsk_mc_crit(prev) == CRIT_LEVEL_B &&
+            is_realtime(prev) && get_rt_job(prev) > 1 && lock_cache) {
+                start = litmus_clock();
+                work = color_sched_out_task(prev);
+                tsk_rt(prev)->flush = litmus_clock() - start;
+                tsk_rt(prev)->flush_work = work;
+        }
+
+        TS_SCHED_START;
+        TS_LVLA_SCHED_START;
+        TS_LVLB_SCHED_START;
+        TS_LVLC_SCHED_START;
+
         raw_spin_lock(&entry->lock);
 
         BUG_ON(entry->scheduled && entry->scheduled != prev);
@@ -1313,14 +1327,6 @@ static struct task_struct* mc_schedule(struct task_struct* prev)
                 update_server_time(entry->scheduled);
         }
 
-        if (prev && tsk_mc_crit(prev) == CRIT_LEVEL_B &&
-            is_realtime(prev) && get_rt_job(prev) > 1 && lock_cache) {
-                start = litmus_clock();
-                color_sched_out_task(prev);
-                tsk_rt(prev)->flush = litmus_clock() - start;
-        }
-
-
         /* Determine state */
         exists      = entry->scheduled != NULL;
         blocks      = exists && !is_running(entry->scheduled);
@@ -1377,11 +1383,17 @@ static struct task_struct* mc_schedule(struct task_struct* prev)
 
         raw_spin_unlock(&entry->lock);
 
+        TS_LVLA_SCHED_END(next);
+        TS_LVLB_SCHED_END(next);
+        TS_LVLC_SCHED_END(next);
+        TS_SCHED_END(next);
+
         if (next != prev) {
                 if (next && tsk_mc_crit(next) == CRIT_LEVEL_B && lock_cache) {
                         start = litmus_clock();
-                        color_sched_in_task(next);
+                        work = color_sched_in_task(next);
                         tsk_rt(next)->load = litmus_clock() - start;
+                        tsk_rt(next)->load_work = work;
                 }
         }
 
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 9612ed5831a1..5a196e1b0fbd 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -198,11 +198,15 @@ feather_callback void do_sched_trace_task_completion(unsigned long id,
         struct task_struct *t = (struct task_struct*) _task;
         struct st_event_record* rec = get_record(ST_COMPLETION, t);
         if (rec) {
-                rec->data.completion.when   = tsk_rt(t)->user_job.exec_time;
+                rec->data.completion.exec   = tsk_rt(t)->user_job.exec_time;
                 rec->data.completion.flush  = tsk_rt(t)->flush;
                 rec->data.completion.load   = tsk_rt(t)->load;
+                rec->data.completion.flush_work = tsk_rt(t)->flush_work;
+                rec->data.completion.load_work  = tsk_rt(t)->load_work;
                 tsk_rt(t)->flush = 0;
                 tsk_rt(t)->load  = 0;
+                tsk_rt(t)->flush_work = 0;
+                tsk_rt(t)->load_work  = 0;
                 put_record(rec);
         }
 }