4 files changed, 10 insertions, 7 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index d84248828cf1..8c996b91ead8 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -227,6 +227,7 @@ struct rt_param {
         struct control_page * ctrl_page;
 
         lt_t max_exec_time;
+        lt_t tot_exec_time;
 };
 
 /*      Possible RT flags       */
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index c71a08ab552e..f910c63c067a 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -81,7 +81,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 fb093c03d53d..50728a416c6c 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -8,13 +8,14 @@
 
 static inline void setup_release(struct task_struct *t, lt_t release)
 {
-        /* prepare next release */
-        t->rt_param.job_params.release = release;
-        t->rt_param.job_params.deadline = release + get_rt_relative_deadline(t);
-        t->rt_param.job_params.exec_time = 0;
+        tsk_rt(t)->tot_exec_time += tsk_rt(t)->job_params.exec_time;
 
+        /* prepare next release */
+        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;
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 4ada33c6979b..73ce4df517ef 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -231,10 +231,11 @@ feather_callback void do_sched_trace_task_exit(unsigned long id,
 {
         struct task_struct *t = (struct task_struct*) _task;
         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);
 
         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);
         }