From 45d0f315ec64bdac3ba0723be07e83b7df7652f8 Mon Sep 17 00:00:00 2001
From: Christopher Kenna <cjk@cs.unc.edu>
Date: Sun, 6 May 2012 21:18:33 -0400
Subject: Add task_exit event that records max exec time under color plugin.

Conflicts:

	include/litmus/rt_param.h
	litmus/sched_color.c
---
 include/litmus/rt_param.h     |  2 ++
 include/litmus/sched_trace.h  | 19 ++++++++++++++++++-
 include/trace/events/litmus.h | 22 ++++++++++++++++++++++
 litmus/sched_task_trace.c     | 13 +++++++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index fac939dbd33a..d84248828cf1 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -225,6 +225,8 @@ struct rt_param {
 
 	/* Pointer to the page shared between userspace and kernel. */
 	struct control_page * ctrl_page;
+
+	lt_t max_exec_time;
 };
 
 /*	Possible RT flags	*/
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index adc223e9c8ab..098df0653172 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 b3a8f166e65f..c3a92f8ec6ef 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -274,6 +274,28 @@ TRACE_EVENT(litmus_sys_release,
 	TP_printk("SynRelease(%Lu) at %Lu\n", __entry->rel, __entry->when)
 );
 
+/*
+ * 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
  */
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 5ef8d09ab41f..d2ece6b764b0 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -226,6 +226,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)
-- 
cgit v1.2.2