Merged with latest kernelshark branch.

Conflicts:

	include/litmus/sched_trace.h
	include/trace/events/litmus.h

3 files changed, 35 insertions, 57 deletions

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 2f992789affb..fa7042f744cb 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -208,6 +208,15 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
 #define trace_litmus_server_release(sid, job, release, deadline)
 #define trace_litmus_server_completion(sid, job)
 
+#define trace_litmus_container_param(cid, name)
+#define trace_litmus_server_param(sid, cid, wcet, time)
+#define trace_litmus_server_switch_to(sid, job, tid, tjob, cpu)
+#define trace_litmus_server_switch_away(sid, job, tid, tjob, cpu)
+#define trace_litmus_server_release(sid, job, release, deadline)
+#define trace_litmus_server_completion(sid, job)
+#define trace_litmus_server_block(sid)
+#define trace_litmus_server_resume(sid)
+
 #endif
 
 
@@ -296,25 +305,6 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
                 trace_litmus_sys_release(when);                         \
         } while (0)
 
-#define sched_trace_task_exit(t)                                        \
-        do {                                                            \
-                SCHED_TRACE(SCHED_TRACE_BASE_ID + 11,                   \
-                        do_sched_trace_task_exit, t);                   \
-                trace_litmus_task_exit(t);                              \
-        } while (0)
-
-
-#define sched_trace_task_tardy(t)                                       \
-        do {                                                            \
-                SCHED_TRACE(SCHED_TRACE_BASE_ID + 12,                   \
-                        do_sched_trace_task_tardy, t);                  \
-        } while (0)
-
-#define QT_START lt_t _qt_start = litmus_clock()
-#define QT_END \
-        sched_trace_log_message("%d P%d      [%s@%s:%d]: Took %llu\n\n", \
-                TRACE_ARGS, litmus_clock() - _qt_start)
-
 #define sched_trace_container_param(cid, name)                          \
         do {                                                            \
                 trace_litmus_container_param(cid, name);                \
@@ -325,19 +315,19 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
                 trace_litmus_server_param(sid, cid, wcet, period);      \
         } while(0)
 
-#define sched_trace_server_switch_to(sid, job, tid)                     \
+#define sched_trace_server_switch_to(sid, job, tid, tjob, cpu)          \
         do {                                                            \
-                trace_litmus_server_switch_to(sid, job, tid);           \
+                trace_litmus_server_switch_to(sid, job, tid, tjob, cpu);\
         } while(0)
 
-#define sched_trace_server_switch_away(sid, job, tid)                   \
+#define sched_trace_server_switch_away(sid, job, tid, tjob, cpu)        \
         do {                                                            \
-                trace_litmus_server_switch_away(sid, job, tid);         \
+                trace_litmus_server_switch_away(sid, job, tid, tjob, cpu);\
         } while (0)
 
-#define sched_trace_server_release(sid, job, rel, dead)                 \
+#define sched_trace_server_release(sid, job, release, deadline)         \
         do {                                                            \
-                trace_litmus_server_release(sid, job, rel, dead);       \
+                trace_litmus_server_release(sid, job, release, deadline); \
         } while (0)
 
 #define sched_trace_server_completion(sid, job)                         \
diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index c3a92f8ec6ef..ba4217bc7049 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -275,28 +275,6 @@ TRACE_EVENT(litmus_sys_release,
 );
 
 /*
- * Trace task exit
- */
-TRACE_EVENT(litmus_task_exit,
-
-        TP_PROTO(struct task_struct *t),
-
-        TP_ARGS(t),
-
-        TP_STRUCT__entry(
-                __field( pid_t, pid )
-                __field( unsigned long long, max_exec_time )
-        ),
-
-        TP_fast_assign(
-                __entry->pid = t ? t->pid : 0;
-                __entry->max_exec_time = t ? t->rt_param.max_exec_time : 0;
-        ),
-
-        TP_printk("(%u) exit\n", __entry->pid)
-);
-
-/*
  * Containers
  */
 TRACE_EVENT(litmus_container_param,
@@ -344,43 +322,54 @@ TRACE_EVENT(litmus_server_param,
 
 TRACE_EVENT(litmus_server_switch_to,
 
-        TP_PROTO(int sid, unsigned int job, int tid),
+        TP_PROTO(int sid, unsigned int job, int tid, unsigned int tjob, int cpu),
 
-        TP_ARGS(sid, job, tid),
+        TP_ARGS(sid, job, tid, tjob, cpu),
 
-        TP_STRUCT__entry(
+        TP_STRUCT_entry(
                 __field( int, sid)
                 __field( unsigned int, job)
                 __field( int, tid)
+                __field( unsigned int, tjob)
+                __field( int, cpu)
         ),
 
         TP_fast_assign(
                 __entry->sid = sid;
                 __entry->tid = tid;
                 __entry->job = job;
+                __entry->tjob = tjob;
+                __entry->cpu = cpu;
         ),
 
-        TP_printk("switch_to(server(%d, %u)): %d\n", __entry->sid, __entry->job, __entry->tid)
+        TP_printk("switch_to(server(%d, %u)): (%d, %d) on %d\n",
+                  __entry->sid, __entry->job, __entry->tid, __entry->tjob, __entry->cpu)
 );
 
 TRACE_EVENT(litmus_server_switch_away,
 
-        TP_PROTO(int sid, unsigned int job, int tid),
+            TP_PROTO(int sid, unsigned int job, int tid, unsigned int tjob, int cpu),
 
-        TP_ARGS(sid, job, tid),
+            TP_ARGS(sid, job, tid, tjob, cpu),
 
         TP_STRUCT__entry(
                 __field( int, sid)
                 __field( unsigned int, job)
                 __field( int, tid)
+                __field( unsigned int, tjob)
+                __field( int, cpu)
         ),
 
         TP_fast_assign(
                 __entry->sid = sid;
                 __entry->tid = tid;
+                __entry->job = job;
+                __entry->tjob = tjob;
+                __entry->cpu = cpu;
         ),
 
-        TP_printk("switch_away(server(%d, %u)): %d\n", __entry->sid, __entry->job, __entry->tid)
+        TP_printk("switch_away(server(%d, %u)): (%d, %d) on %d\n",
+                  __entry->sid, __entry->job, __entry->tid, __entry->tjob, __entry->cpu)
 );
 
 TRACE_EVENT(litmus_server_release,
@@ -405,7 +394,8 @@ TRACE_EVENT(litmus_server_release,
                 __entry->deadline = deadline;
         ),
 
-        TP_printk("release(server(%d, %u)), release: %llu, deadline: %llu\n",  __entry->sid, __entry->job, __entry->release, __entry->deadline)
+        TP_printk("release(server(%d, %u)), release: %llu, deadline: %llu\n",
+                  __entry->sid, __entry->job, __entry->release, __entry->deadline)
 );
 
 TRACE_EVENT(litmus_server_completion,
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 3516463663bc..dc94be71bfb6 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -384,8 +384,6 @@ void litmus_exit_task(struct task_struct* tsk)
 {
         if (is_realtime(tsk)) {
                 sched_trace_task_completion(tsk, 1);
-                sched_trace_task_exit(tsk);
-                sched_trace_task_tardy(tsk);
 
                 litmus->task_exit(tsk);