Track tasks average execution time, drop in TASK_EXIT record

5 files changed, 14 insertions, 7 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 2a4b99be636b..209a89d7b459 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -228,6 +228,7 @@ struct rt_param {
 
 #ifdef CONFIG_PLUGIN_COLOR
         lt_t max_exec_time;
+        lt_t tot_exec_time;
         struct color_ctrl_page *color_ctrl_page;
         struct dgl_group_req *req;
 #endif
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 84b4fab5c2ca..d14eeaf0099f 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -82,7 +82,7 @@ struct st_sys_release_data {
 };
 
 struct st_task_exit_data {
-        u64     when;
+        u64     avg_exec_time;
         u64     max_exec_time;
 };
 
diff --git a/litmus/jobs.c b/litmus/jobs.c
index 36e314625d86..4da53a8c4c43 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -9,12 +9,15 @@
 void prepare_for_next_period(struct task_struct *t)
 {
         BUG_ON(!t);
+#ifdef CONFIG_PLUGIN_COLOR
+        tsk_rt(t)->tot_exec_time += tsk_rt(t)->job_params.exec_time;
+#endif
         /* prepare next release */
-        t->rt_param.job_params.release   = t->rt_param.job_params.deadline;
-        t->rt_param.job_params.deadline += get_rt_period(t);
-        t->rt_param.job_params.exec_time = 0;
+        tsk_rt(t)->job_params.release   = tsk_rt(t)->job_params.deadline;
+        tsk_rt(t)->job_params.deadline += get_rt_period(t);
+        tsk_rt(t)->job_params.exec_time = 0;
         /* update job sequence number */
-        t->rt_param.job_params.job_no++;
+        tsk_rt(t)->job_params.job_no++;
 
         /* don't confuse Linux */
         t->rt.time_slice = 1;
@@ -22,7 +25,7 @@ void prepare_for_next_period(struct task_struct *t)
 
 void release_at(struct task_struct *t, lt_t start)
 {
-        t->rt_param.job_params.deadline = start;
+        tsk_rt(t)->job_params.deadline = start;
         prepare_for_next_period(t);
         set_rt_flags(t, RT_F_RUNNING);
 }
diff --git a/litmus/sched_color.c b/litmus/sched_color.c
index 6c278f5d26cf..29b2be97da52 100644
--- a/litmus/sched_color.c
+++ b/litmus/sched_color.c
@@ -534,6 +534,7 @@ static void color_task_new(struct task_struct *t, int on_rq, int running)
         tsk_rt(t)->req = req;
 
         tsk_rt(t)->max_exec_time = 0;
+        tsk_rt(t)->tot_exec_time = 0;
 
         /* Fill request */
         if (tsk_rt(t)->color_ctrl_page) {
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index afe2333eb723..cbfcecbfe93a 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -232,12 +232,14 @@ feather_callback void do_sched_trace_task_exit(unsigned long id,
         struct task_struct *t = (struct task_struct*) _task;
 #ifdef CONFIG_PLUGIN_COLOR
         const lt_t max_exec_time = tsk_rt(t)->max_exec_time;
+        const lt_t avg_exec_time = tsk_rt(t)->tot_exec_time / (get_rt_job(t) - 1);
 #else
         const lt_t max_exec_time = 0;
+        const lt_t avg_exec_time = 0;
 #endif
         struct st_event_record *rec = get_record(ST_TASK_EXIT, t);
         if (rec) {
-                rec->data.task_exit.when          = now();
+                rec->data.task_exit.avg_exec_time = avg_exec_time;
                 rec->data.task_exit.max_exec_time = max_exec_time;
                 put_record(rec);
         }