Initial commit

2 files changed, 115 insertions, 103 deletions

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 42c361d54a0f..adc223e9c8ab 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -182,12 +182,10 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
 
 #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_switch_to(sid, job, tid)
+#define trace_litmus_server_switch_away(sid, job, tid)
 #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
 
@@ -235,18 +233,34 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
                 trace_litmus_task_completion(t, forced);                \
         } while (0)
 
-#define sched_trace_task_block(t)                                       \
+#define sched_trace_task_block_on(t, i)                                 \
         do {                                                            \
                 SCHED_TRACE(SCHED_TRACE_BASE_ID + 7,                    \
                         do_sched_trace_task_block, t);                  \
-                trace_litmus_task_block(t);                             \
+                trace_litmus_task_block(t, i);                          \
         } while (0)
 
-#define sched_trace_task_resume(t)                                      \
+#define sched_trace_task_block(t)                                       \
+        sched_trace_task_block_on(t, 0)
+
+#define sched_trace_task_resume_on(t, i)                                \
         do {                                                            \
                 SCHED_TRACE(SCHED_TRACE_BASE_ID + 8,                    \
                                 do_sched_trace_task_resume, t);         \
-                trace_litmus_task_resume(t);                            \
+                trace_litmus_task_resume(t, i);                         \
+        } while (0)
+
+#define sched_trace_task_resume(t)                                      \
+        sched_trace_task_resume_on(t, 0)
+
+#define sched_trace_resource_acquire(t, i)                              \
+        do {                                                            \
+                trace_litmus_resource_acquire(t, i);                    \
+        } while (0)
+
+#define sched_trace_resource_released(t, i)                             \
+        do {                                                            \
+                trace_litmus_resource_released(t, i);                   \
         } while (0)
 
 #define sched_trace_action(t, action)                                   \
@@ -261,6 +275,11 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
                 trace_litmus_sys_release(when);                         \
         } 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);                \
@@ -271,19 +290,19 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
                 trace_litmus_server_param(sid, cid, wcet, period);      \
         } while(0)
 
-#define sched_trace_server_switch_to(sid, job, tid, tjob, cpu)          \
+#define sched_trace_server_switch_to(sid, job, tid)                     \
         do {                                                            \
-                trace_litmus_server_switch_to(sid, job, tid, tjob, cpu);\
+                trace_litmus_server_switch_to(sid, job, tid);           \
         } while(0)
 
-#define sched_trace_server_switch_away(sid, job, tid, tjob, cpu)        \
+#define sched_trace_server_switch_away(sid, job, tid)                   \
         do {                                                            \
-                trace_litmus_server_switch_away(sid, job, tid, tjob, cpu);\
+                trace_litmus_server_switch_away(sid, job, tid);         \
         } while (0)
 
-#define sched_trace_server_release(sid, job, release, deadline)         \
+#define sched_trace_server_release(sid, job, rel, dead)                 \
         do {                                                            \
-                trace_litmus_server_release(sid, job, release, deadline); \
+                trace_litmus_server_release(sid, job, rel, dead);       \
         } while (0)
 
 #define sched_trace_server_completion(sid, job)                         \
@@ -291,16 +310,6 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
                 trace_litmus_server_completion(sid, job);               \
         } while (0)
 
-#define sched_trace_server_resume(sid)                                  \
-        do {                                                            \
-                trace_litmus_server_resume(sid);                        \
-        } while (0)
-
-#define sched_trace_server_block(sid)                                   \
-        do {                                                            \
-                trace_litmus_server_block(sid);                         \
-        } while (0)
-
 #define sched_trace_quantum_boundary() /* NOT IMPLEMENTED */
 
 #endif /* __KERNEL__ */
diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index e1843ad37509..b3a8f166e65f 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -11,10 +11,6 @@
 
 #include <litmus/litmus.h>
 #include <litmus/rt_param.h>
-
-/*
- * Tracing task admission
- */
 TRACE_EVENT(litmus_task_param,
 
         TP_PROTO(struct task_struct *t),
@@ -24,9 +20,9 @@ TRACE_EVENT(litmus_task_param,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          wcet    )
-                __field( lt_t,          period  )
-                __field( lt_t,          phase   )
+                __field( unsigned long long,            wcet    )
+                __field( unsigned long long,            period  )
+                __field( unsigned long long,            phase   )
                 __field( int,           partition )
         ),
 
@@ -56,8 +52,8 @@ TRACE_EVENT(litmus_task_release,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          release )
-                __field( lt_t,          deadline        )
+                __field( unsigned long long,            release )
+                __field( unsigned long long,            deadline        )
         ),
 
         TP_fast_assign(
@@ -84,8 +80,8 @@ TRACE_EVENT(litmus_switch_to,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
-                __field( lt_t,          exec_time       )
+                __field( unsigned long long,            when    )
+                __field( unsigned long long,            exec_time       )
         ),
 
         TP_fast_assign(
@@ -112,8 +108,8 @@ TRACE_EVENT(litmus_switch_away,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
-                __field( lt_t,          exec_time       )
+                __field( unsigned long long,            when    )
+                __field( unsigned long long,            exec_time       )
         ),
 
         TP_fast_assign(
@@ -140,7 +136,7 @@ TRACE_EVENT(litmus_task_completion,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            when    )
                 __field( unsigned long, forced  )
         ),
 
@@ -161,21 +157,71 @@ TRACE_EVENT(litmus_task_completion,
  */
 TRACE_EVENT(litmus_task_block,
 
-        TP_PROTO(struct task_struct *t),
+        TP_PROTO(struct task_struct *t, int lid),
 
-        TP_ARGS(t),
+        TP_ARGS(t, lid),
+
+        TP_STRUCT__entry(
+                __field( pid_t,         pid     )
+                __field( int,           lid      )
+                __field( unsigned long long,            when    )
+        ),
+
+        TP_fast_assign(
+                __entry->pid    = t ? t->pid : 0;
+                __entry->lid    = lid;
+                __entry->when   = litmus_clock();
+        ),
+
+        TP_printk("(%u) blocks on %d: %Lu\n", __entry->pid,
+                  __entry->lid, __entry->when)
+);
+
+/*
+ * Lock events
+ */
+TRACE_EVENT(litmus_resource_acquire,
+
+        TP_PROTO(struct task_struct *t, int lid),
+
+        TP_ARGS(t, lid),
+
+        TP_STRUCT__entry(
+                __field( pid_t,         pid     )
+                __field( int,           lid      )
+                __field( unsigned long long,            when    )
+        ),
+
+        TP_fast_assign(
+                __entry->pid    = t ? t->pid : 0;
+                __entry->lid    = lid;
+                __entry->when   = litmus_clock();
+        ),
+
+        TP_printk("(%u) acquires %d: %Lu\n", __entry->pid,
+                  __entry->lid, __entry->when)
+);
+
+TRACE_EVENT(litmus_resource_release,
+
+        TP_PROTO(struct task_struct *t, int lid),
+
+        TP_ARGS(t, lid),
 
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
-                __field( lt_t,          when    )
+                __field( int,           lid      )
+                __field( unsigned long long,            when    )
         ),
 
         TP_fast_assign(
                 __entry->pid    = t ? t->pid : 0;
+                __entry->lid    = lid;
                 __entry->when   = litmus_clock();
         ),
 
-        TP_printk("(%u) blocks: %Lu\n", __entry->pid, __entry->when)
+        TP_printk("(%u) releases %d: %Lu\n", __entry->pid,
+                  __entry->lid, __entry->when)
 );
 
 /*
@@ -183,24 +229,27 @@ TRACE_EVENT(litmus_task_block,
  */
 TRACE_EVENT(litmus_task_resume,
 
-        TP_PROTO(struct task_struct *t),
+        TP_PROTO(struct task_struct *t, int lid),
 
-        TP_ARGS(t),
+        TP_ARGS(t, lid),
 
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
+                __field( int,           lid      )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            when    )
         ),
 
         TP_fast_assign(
                 __entry->pid    = t ? t->pid : 0;
                 __entry->job    = t ? t->rt_param.job_params.job_no : 0;
                 __entry->when   = litmus_clock();
+                __entry->lid    = lid;
         ),
 
-        TP_printk("resume(job(%u, %u)): %Lu\n",
-                        __entry->pid, __entry->job, __entry->when)
+        TP_printk("resume(job(%u, %u)) on %d: %Lu\n",
+                  __entry->pid, __entry->job,
+                  __entry->lid, __entry->when)
 );
 
 /*
@@ -208,13 +257,13 @@ TRACE_EVENT(litmus_task_resume,
  */
 TRACE_EVENT(litmus_sys_release,
 
-        TP_PROTO(lt_t *start),
+        TP_PROTO(unsigned long long *start),
 
         TP_ARGS(start),
 
         TP_STRUCT__entry(
-                __field( lt_t,          rel     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            rel     )
+                __field( unsigned long long,            when    )
         ),
 
         TP_fast_assign(
@@ -273,54 +322,43 @@ TRACE_EVENT(litmus_server_param,
 
 TRACE_EVENT(litmus_server_switch_to,
 
-        TP_PROTO(int sid, unsigned int job, int tid, unsigned int tjob, int cpu),
+        TP_PROTO(int sid, unsigned int job, int tid),
 
-        TP_ARGS(sid, job, tid, tjob, cpu),
+        TP_ARGS(sid, job, tid),
 
         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, %d) on %d\n",
-                  __entry->sid, __entry->job, __entry->tid, __entry->tjob, __entry->cpu)
+        TP_printk("switch_to(server(%d, %u)): %d\n", __entry->sid, __entry->job, __entry->tid)
 );
 
 TRACE_EVENT(litmus_server_switch_away,
 
-            TP_PROTO(int sid, unsigned int job, int tid, unsigned int tjob, int cpu),
+        TP_PROTO(int sid, unsigned int job, int tid),
 
-            TP_ARGS(sid, job, tid, tjob, cpu),
+        TP_ARGS(sid, job, tid),
 
         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, %d) on %d\n",
-                  __entry->sid, __entry->job, __entry->tid, __entry->tjob, __entry->cpu)
+        TP_printk("switch_away(server(%d, %u)): %d\n", __entry->sid, __entry->job, __entry->tid)
 );
 
 TRACE_EVENT(litmus_server_release,
@@ -345,8 +383,7 @@ 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,
@@ -368,40 +405,6 @@ TRACE_EVENT(litmus_server_completion,
         TP_printk("completion(server(%d, %d))\n", __entry->sid, __entry->job)
 );
 
-TRACE_EVENT(litmus_server_resume,
-
-        TP_PROTO(int sid),
-
-        TP_ARGS(sid),
-
-        TP_STRUCT__entry(
-                __field( int, sid)
-        ),
-
-        TP_fast_assign(
-                __entry->sid = sid;
-        ),
-
-        TP_printk("resume(server(%d))\n", __entry->sid)
-);
-
-TRACE_EVENT(litmus_server_block,
-
-        TP_PROTO(int sid),
-
-        TP_ARGS(sid),
-
-        TP_STRUCT__entry(
-                __field( int, sid)
-        ),
-
-        TP_fast_assign(
-                __entry->sid = sid;
-        ),
-
-        TP_printk("block(server(%d))\n", __entry->sid)
-);
-
 #endif /* _SCHED_TASK_TRACEPOINT_H */
 
 /* Must stay outside the protection */