1 files changed, 98 insertions, 5 deletions

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 82bde824129..2f992789aff 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -80,6 +80,17 @@ struct st_sys_release_data {
         u64     release;
 };
 
+struct st_task_exit_data {
+        u64     avg_exec_time;
+        u64     max_exec_time;
+};
+
+struct st_task_tardy_data {
+        u64     total_tardy;
+        u32     max_tardy;
+        u32     missed;
+};
+
 #define DATA(x) struct st_ ## x ## _data x;
 
 typedef enum {
@@ -94,7 +105,9 @@ typedef enum {
         ST_BLOCK,
         ST_RESUME,
         ST_ACTION,
-        ST_SYS_RELEASE
+        ST_SYS_RELEASE,
+        ST_TASK_EXIT,
+        ST_TASK_TARDY,
 } st_event_record_type_t;
 
 struct st_event_record {
@@ -113,6 +126,8 @@ struct st_event_record {
                 DATA(resume);
                 DATA(action);
                 DATA(sys_release);
+                DATA(task_exit);
+                DATA(task_tardy);
         } data;
 };
 
@@ -154,6 +169,10 @@ feather_callback void do_sched_trace_action(unsigned long id,
                                             unsigned long action);
 feather_callback void do_sched_trace_sys_release(unsigned long id,
                                                  lt_t* start);
+feather_callback void do_sched_trace_task_exit(unsigned long id,
+                                                     struct task_struct* task);
+feather_callback void do_sched_trace_task_tardy(unsigned long id,
+                                                     struct task_struct* task);
 
 #endif
 
@@ -179,6 +198,15 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
 #define trace_litmus_task_block(t)
 #define trace_litmus_task_resume(t)
 #define trace_litmus_sys_release(start)
+#define trace_litmus_task_exit(t)
+#define trace_litmus_task_tardy(t)
+
+#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 +254,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)                                   \
@@ -252,6 +296,55 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
                 trace_litmus_sys_release(when);                         \
         } while (0)
 
+#define sched_trace_task_exit(t)                                        \
+        do {                                                            \
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 11,                   \
+                        do_sched_trace_task_exit, t);                   \
+                trace_litmus_task_exit(t);                              \
+        } while (0)
+
+
+#define sched_trace_task_tardy(t)                                       \
+        do {                                                            \
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 12,                   \
+                        do_sched_trace_task_tardy, t);                  \
+        } 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__ */