Container tracing working

4 files changed, 12 insertions, 7 deletions

diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index 5ca4bef205f0..4ad053eac27d 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -310,7 +310,9 @@ TRACE_EVENT(litmus_server_switch_away,
 
 TRACE_EVENT(litmus_server_release,
 
-        TP_PROTO(int sid, unsigned int job, unsigned long long release, unsigned long long deadline),
+        TP_PROTO(int sid, unsigned int job,
+                 unsigned long long release,
+                 unsigned long long deadline),
 
         TP_ARGS(sid, job, release, deadline),
 
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index a9377c0083ad..47679aa5dd09 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -17,6 +17,7 @@
  */
 
 #include <linux/ftrace_event.h>
+#include <litmus/litmus.h>
 
 /*
  * DECLARE_EVENT_CLASS can be used to add a generic function
@@ -54,7 +55,7 @@
 #define __string(item, src) __dynamic_array(char, item, -1)
 
 #undef TP_STRUCT__entry
-#define TP_STRUCT__entry(args...) args
+#define TP_STRUCT__entry(args...) args __field( unsigned long long, __rt_ts )
 
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)  \
@@ -479,7 +480,7 @@ static inline notrace int ftrace_get_offsets_##call(			\
         strcpy(__get_str(dst), src);
 
 #undef TP_fast_assign
-#define TP_fast_assign(args...) args
+#define TP_fast_assign(args...) args; __entry->__rt_ts = litmus_clock();
 
 #undef TP_perf_assign
 #define TP_perf_assign(args...)
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index eb8ae7fab95a..41f02ee3e6ca 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -126,7 +126,9 @@ static int interrupt_cpu;
 
 static int sid(struct crit_entry *ce)
 {
-        return ce->level * num_online_cpus() + crit_cpu(ce)->cpu;
+        int level = ce->level * num_online_cpus() + crit_cpu(ce)->cpu + 1;
+        BUG_ON(level >= 0);
+        return -level;
 }
 
 /*
diff --git a/litmus/sched_mc_ce.c b/litmus/sched_mc_ce.c
index 4808377b9bb7..702b46da93d5 100644
--- a/litmus/sched_mc_ce.c
+++ b/litmus/sched_mc_ce.c
@@ -139,7 +139,7 @@ static void mc_ce_job_completion(struct domain *dom, struct task_struct *ts)
 
         TRACE_TASK(ts, "Completed\n");
 
-        sched_trace_task_completion(ts, 0);
+        /* sched_trace_task_completion(ts, 0); */
         /* post-increment is important here */
         just_finished = (tsk_rt(ts)->job_params.job_no)++;
 
@@ -292,7 +292,7 @@ long mc_ce_admit_task_common(struct task_struct *ts)
                 printk(KERN_INFO "litmus: couldn't get pid struct for %d\n",
                                 ts->pid);
                 goto out;
-n       }
+        }
 
         if (lvl_a_id >= pid_table->num_pid_entries) {
                 printk(KERN_INFO "litmus: level A id greater than expected "
@@ -499,7 +499,7 @@ lt_t mc_ce_timer_callback_common(struct domain *dom)
                         tsk_rt(should_schedule)->job_params.deadline -
                         pid_entry->budget;
                 tsk_rt(should_schedule)->job_params.exec_time = 0;
-                sched_trace_task_release(should_schedule);
+                /* sched_trace_task_release(should_schedule); */
                 set_rt_flags(ce_data->should_schedule, RT_F_RUNNING);
         }
         return next_timer_abs;