First container trace iteration

4 files changed, 44 insertions, 0 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 */