Move task time accounting into the complete_job method.

1 files changed, 19 insertions, 8 deletions

diff --git a/litmus/jobs.c b/litmus/jobs.c
index 1dc97d32a35..8a0c889e2cb 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -5,18 +5,13 @@
 
 #include <litmus/litmus.h>
 #include <litmus/jobs.h>
+#include <litmus/trace.h>
 
 static inline void setup_release(struct task_struct *t, lt_t release)
 {
-        lt_t exec_time = tsk_rt(t)->job_params.exec_time;
-
-        tsk_rt(t)->tot_exec_time += exec_time;
-        if (tsk_rt(t)->max_exec_time < exec_time)
-                tsk_rt(t)->max_exec_time = 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.release   = release;
+        tsk_rt(t)->job_params.deadline += release + get_rt_period(t);
         tsk_rt(t)->job_params.exec_time = 0;
         /* update job sequence number */
         tsk_rt(t)->job_params.job_no++;
@@ -52,6 +47,22 @@ void release_at(struct task_struct *t, lt_t start)
  */
 long complete_job(void)
 {
+        lt_t amount;
+        lt_t now = litmus_clock();
+        lt_t exec_time = tsk_rt(current)->job_params.exec_time;
+
+        tsk_rt(current)->tot_exec_time += exec_time;
+        if (lt_before(tsk_rt(current)->max_exec_time, exec_time))
+                tsk_rt(current)->max_exec_time = exec_time;
+
+        if (is_tardy(current, now)) {
+                amount = now - get_deadline(current);
+                if (lt_after(amount, tsk_rt(current)->max_tardy))
+                        tsk_rt(current)->max_tardy = amount;
+                tsk_rt(current)->total_tardy += amount;
+                ++tsk_rt(current)->missed;
+        }
+
         /* Mark that we do not excute anymore */
         set_rt_flags(current, RT_F_SLEEP);
         /* call schedule, this will return when a new job arrives