First container trace iteration

5 files changed, 188 insertions, 19 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 4322d59c0e8f..d5dbc82f0dfc 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/rt_param.h b/include/litmus/rt_param.h
index 55419d411614..4293575d3472 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -85,6 +85,7 @@ struct rt_job {
 
         lt_t    real_release;
         lt_t    real_deadline;
+        unsigned int fake_job_no;
 
         /* How much service has this job received so far? */
         lt_t    exec_time;
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 32c23974e45a..0f529fa78b4d 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -69,6 +69,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              */
@@ -95,6 +98,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 6868a07dac46..368bd3dc3be8 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -181,6 +181,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
 
 
@@ -258,6 +265,35 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
         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 */
 
diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index 0fffcee02be0..5ca4bef205f0 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  )
         ),
 
@@ -167,7 +163,7 @@ TRACE_EVENT(litmus_task_block,
 
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            when    )
         ),
 
         TP_fast_assign(
@@ -190,7 +186,7 @@ TRACE_EVENT(litmus_task_resume,
         TP_STRUCT__entry(
                 __field( pid_t,         pid     )
                 __field( unsigned int,  job     )
-                __field( lt_t,          when    )
+                __field( unsigned long long,            when    )
         ),
 
         TP_fast_assign(
@@ -208,13 +204,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 +221,135 @@ 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 */