7 files changed, 274 insertions, 33 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 0b071fd359f9..2776470bb897 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -44,6 +44,8 @@ void litmus_exit_task(struct task_struct *tsk);
 
 #define tsk_rt(t)               (&(t)->rt_param)
 
+#define get_server_job(t) (tsk_rt(t)->job_params.fake_job_no)
+
 /*      Realtime utility macros */
 #define get_rt_flags(t)         (tsk_rt(t)->flags)
 #define set_rt_flags(t,f)       (tsk_rt(t)->flags=(f))
diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index 4d7b870cb443..41991d5af01b 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -9,6 +9,7 @@ struct litmus_lock_ops;
 struct litmus_lock {
         struct litmus_lock_ops *ops;
         int type;
+        int id;
 };
 
 struct litmus_lock_ops {
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index d6d799174160..ba62e10d6f2c 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -89,7 +89,7 @@ struct rt_job {
         lt_t    exec_time;
 
         /* Which job is this. This is used to let user space
-         * specify which job to wait for, which is important if jobs
+yes      * specify which job to wait for, which is important if jobs
          * overrun. If we just call sys_sleep_next_period() then we
          * will unintentionally miss jobs after an overrun.
          *
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 6e7cabdddae8..01786b57a4a9 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -67,6 +67,9 @@ typedef long (*admit_task_t)(struct task_struct* tsk);
 
 typedef void (*release_at_t)(struct task_struct *t, lt_t start);
 
+/* TODO remove me */
+typedef void (*release_ts_t)(lt_t time);
+
 struct sched_plugin {
         struct list_head        list;
         /*      basic info              */
@@ -93,6 +96,8 @@ struct sched_plugin {
         task_block_t            task_block;
         task_exit_t             task_exit;
 
+        release_ts_t            release_ts;
+
 #ifdef CONFIG_LITMUS_LOCKING
         /*      locking protocols       */
         allocate_lock_t         allocate_lock;
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 82bde8241298..49972d75ef38 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -180,6 +180,13 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
 #define trace_litmus_task_resume(t)
 #define trace_litmus_sys_release(start)
 
+#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)
+#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)
+
 #endif
 
 
@@ -226,18 +233,28 @@ 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(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_resume(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_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)                                   \
@@ -252,6 +269,41 @@ 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);                \
+        } while (0)
+
+#define sched_trace_server_param(sid, cid, wcet, period)                \
+        do {                                                            \
+                trace_litmus_server_param(sid, cid, wcet, period);      \
+        } while(0)
+
+#define sched_trace_server_switch_to(sid, job, tid)                     \
+        do {                                                            \
+                trace_litmus_server_switch_to(sid, job, tid);           \
+        } while(0)
+
+#define sched_trace_server_switch_away(sid, job, tid)                   \
+        do {                                                            \
+                trace_litmus_server_switch_away(sid, job, tid);         \
+        } while (0)
+
+#define sched_trace_server_release(sid, job, rel, dead)                 \
+        do {                                                            \
+                trace_litmus_server_release(sid, job, rel, dead);       \
+        } while (0)
+
+#define sched_trace_server_completion(sid, job)                         \
+        do {                                                            \
+                trace_litmus_server_completion(sid, job);               \
+        } 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 0fffcee02be0..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( 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) 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( 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) 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(
@@ -225,6 +274,137 @@ TRACE_EVENT(litmus_sys_release,
         TP_printk("SynRelease(%Lu) at %Lu\n", __entry->rel, __entry->when)
 );
 
+/*
+ * Containers
+ */
+TRACE_EVENT(litmus_container_param,
+
+        TP_PROTO(int cid, const char *name),
+
+        TP_ARGS(cid, name),
+
+        TP_STRUCT__entry(
+                __field( int,  cid )
+                __array( char,  name,   TASK_COMM_LEN   )
+        ),
+
+        TP_fast_assign(
+               memcpy(__entry->name, name, TASK_COMM_LEN);
+               __entry->cid = cid;
+        ),
+
+        TP_printk("container, name: %s, id: %d\n", __entry->name, __entry->cid)
+);
+
+TRACE_EVENT(litmus_server_param,
+
+        TP_PROTO(int sid, int cid, unsigned long long wcet, unsigned long long period),
+
+        TP_ARGS(sid, cid, wcet, period),
+
+        TP_STRUCT__entry(
+                __field( int, sid )
+                __field( int, cid )
+                __field( unsigned long long, wcet )
+                __field( unsigned long long, period )
+        ),
+
+        TP_fast_assign(
+               __entry->cid = cid;
+               __entry->sid = sid;
+               __entry->wcet = wcet;
+               __entry->period = period;
+        ),
+
+        TP_printk("server(%llu, %llu), sid: %llu, cont: %llu\n",
+                  __entry->wcet, __entry->period, __entry->sid, __entry->cid)
+);
+
+TRACE_EVENT(litmus_server_switch_to,
+
+        TP_PROTO(int sid, unsigned int job, int tid),
+
+        TP_ARGS(sid, job, tid),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+                __field( unsigned int, job)
+                __field( int, tid)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+                __entry->tid = tid;
+                __entry->job = job;
+        ),
+
+        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),
+
+        TP_ARGS(sid, job, tid),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+                __field( unsigned int, job)
+                __field( int, tid)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+                __entry->tid = tid;
+        ),
+
+        TP_printk("switch_away(server(%d, %u)): %d\n", __entry->sid, __entry->job, __entry->tid)
+);
+
+TRACE_EVENT(litmus_server_release,
+
+        TP_PROTO(int sid, unsigned int job,
+                 unsigned long long release,
+                 unsigned long long deadline),
+
+        TP_ARGS(sid, job, release, deadline),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+                __field( unsigned int, job)
+                __field( unsigned long long, release)
+                __field( unsigned long long, deadline)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+                __entry->job = job;
+                __entry->release = release;
+                __entry->deadline = 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,
+
+        TP_PROTO(int sid, int job),
+
+        TP_ARGS(sid, job),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+                __field( unsigned int, job)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+                __entry->job = job;
+        ),
+
+        TP_printk("completion(server(%d, %d))\n", __entry->sid, __entry->job)
+);
+
 #endif /* _SCHED_TASK_TRACEPOINT_H */
 
 /* Must stay outside the protection */
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 533c49f48047..4d6f3474e8fa 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)  \
@@ -507,7 +508,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...)