Add task_exit event that records max exec time under color plugin.

Conflicts:

	include/litmus/rt_param.h
	litmus/sched_color.c

4 files changed, 55 insertions, 1 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index a16ac84d804..b3d4b37f81e 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -270,6 +270,8 @@ struct rt_param {
 
         /* Pointer to the page shared between userspace and kernel. */
         struct control_page * ctrl_page;
+
+        lt_t max_exec_time;
 };
 
 #endif
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index adc223e9c8a..098df065317 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -80,6 +80,11 @@ struct st_sys_release_data {
         u64     release;
 };
 
+struct st_task_exit_data {
+        u64     max_exec_time;
+        u64     __unused;
+};
+
 #define DATA(x) struct st_ ## x ## _data x;
 
 typedef enum {
@@ -94,7 +99,8 @@ typedef enum {
         ST_BLOCK,
         ST_RESUME,
         ST_ACTION,
-        ST_SYS_RELEASE
+        ST_SYS_RELEASE,
+        ST_TASK_EXIT,
 } st_event_record_type_t;
 
 struct st_event_record {
@@ -113,6 +119,7 @@ struct st_event_record {
                 DATA(resume);
                 DATA(action);
                 DATA(sys_release);
+                DATA(task_exit);
         } data;
 };
 
@@ -154,6 +161,8 @@ 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);
 
 #endif
 
@@ -179,6 +188,7 @@ 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_container_param(cid, name)
 #define trace_litmus_server_param(sid, cid, wcet, time)
@@ -275,6 +285,13 @@ 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 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", \
diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index b3a8f166e65..c3a92f8ec6e 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -275,6 +275,28 @@ TRACE_EVENT(litmus_sys_release,
 );
 
 /*
+ * Trace task exit
+ */
+TRACE_EVENT(litmus_task_exit,
+
+        TP_PROTO(struct task_struct *t),
+
+        TP_ARGS(t),
+
+        TP_STRUCT__entry(
+                __field( pid_t, pid )
+                __field( unsigned long long, max_exec_time )
+        ),
+
+        TP_fast_assign(
+                __entry->pid = t ? t->pid : 0;
+                __entry->max_exec_time = t ? t->rt_param.max_exec_time : 0;
+        ),
+
+        TP_printk("(%u) exit\n", __entry->pid)
+);
+
+/*
  * Containers
  */
 TRACE_EVENT(litmus_container_param,
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 1679a13bde2..a85057a6c81 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -229,6 +229,19 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
         }
 }
 
+feather_callback void do_sched_trace_task_exit(unsigned long id,
+                                                 unsigned long _task)
+{
+        struct task_struct *t = (struct task_struct*) _task;
+        const lt_t max_exec_time = tsk_rt(t)->max_exec_time;
+
+        struct st_event_record *rec = get_record(ST_TASK_EXIT, t);
+        if (rec) {
+                rec->data.task_exit.max_exec_time = max_exec_time;
+                put_record(rec);
+        }
+}
+
 feather_callback void do_sched_trace_action(unsigned long id,
                                             unsigned long _task,
                                             unsigned long action)