Initial commit.

3 files changed, 229 insertions, 2 deletions

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 82bde8241298..42c361d54a0f 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -180,6 +180,15 @@ 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, 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
 
 
@@ -252,6 +261,46 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
                 trace_litmus_sys_release(when);                         \
         } while (0)
 
+#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, tjob, cpu)          \
+        do {                                                            \
+                trace_litmus_server_switch_to(sid, job, tid, tjob, cpu);\
+        } while(0)
+
+#define sched_trace_server_switch_away(sid, job, tid, tjob, cpu)        \
+        do {                                                            \
+                trace_litmus_server_switch_away(sid, job, tid, tjob, cpu);\
+        } while (0)
+
+#define sched_trace_server_release(sid, job, release, deadline)         \
+        do {                                                            \
+                trace_litmus_server_release(sid, job, release, deadline); \
+        } while (0)
+
+#define sched_trace_server_completion(sid, job)                         \
+        do {                                                            \
+                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 0fffcee02be0..e1843ad37509 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -225,6 +225,183 @@ 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, unsigned int tjob, int cpu),
+
+        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_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, unsigned int tjob, int cpu),
+
+            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, %d) on %d\n",
+                  __entry->sid, __entry->job, __entry->tid, __entry->tjob, __entry->cpu)
+);
+
+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)
+);
+
+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 */
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...)