Add sched_trace data for Apative EDZLwip-aedzl-revised

Added new trace event, st_task_completion_adaptive, to trace estimated
execution time and estimation error when an AEDZL task completes.

3 files changed, 33 insertions, 0 deletions

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index e1b0c9712b5f..237d1e1641d0 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -57,6 +57,12 @@ struct st_completion_data {	/* A job completed. */
         u8      __unused[3];
 };
 
+struct st_completion_adaptive_data { /* Extra completion data for AEDZL */
+        u32 estimated_exe;
+        s32 accumulated_err;
+        u8  __unused[8];
+};
+
 struct st_block_data {          /* A task blocks. */
         u64     when;
         u64     __unused;
@@ -86,6 +92,7 @@ typedef enum {
         ST_BLOCK,
         ST_RESUME,
         ST_SYS_RELEASE,
+        ST_COMPLETION_ADAPTIVE
 } st_event_record_type_t;
 
 struct st_event_record {
@@ -100,6 +107,7 @@ struct st_event_record {
                 DATA(switch_to);
                 DATA(switch_away);
                 DATA(completion);
+                DATA(completion_adaptive);
                 DATA(block);
                 DATA(resume);
                 DATA(sys_release);
@@ -136,6 +144,8 @@ feather_callback void do_sched_trace_task_switch_away(unsigned long id,
 feather_callback void do_sched_trace_task_completion(unsigned long id,
                                                      struct task_struct* task,
                                                      unsigned long forced);
+feather_callback void do_sched_trace_task_completion_adaptive(unsigned long id,
+                                                struct task_struct* task);
 feather_callback void do_sched_trace_task_block(unsigned long id,
                                                 struct task_struct* task);
 feather_callback void do_sched_trace_task_resume(unsigned long id,
@@ -175,6 +185,8 @@ feather_callback void do_sched_trace_sys_release(unsigned long id,
 /* when is a pointer, it does not need an explicit cast to unsigned long */
 #define sched_trace_sys_release(when) \
         SCHED_TRACE(SCHED_TRACE_BASE_ID + 9, do_sched_trace_sys_release, when)
+#define sched_trace_task_completion_adaptive(t) \
+        SCHED_TRACE(SCHED_TRACE_BASE_ID + 10, do_sched_trace_task_completion_adaptive, t)
 
 #define sched_trace_quantum_boundary() /* NOT IMPLEMENTED */
 
diff --git a/litmus/sched_aedzl.c b/litmus/sched_aedzl.c
index 4943e1ed7616..99c1ad02bbb4 100644
--- a/litmus/sched_aedzl.c
+++ b/litmus/sched_aedzl.c
@@ -514,6 +514,7 @@ static noinline void job_completion(struct task_struct *t, int forced)
         BUG_ON(!t);
 
         sched_trace_task_completion(t, forced);
+        sched_trace_task_completion_adaptive(t);
 
         TRACE_TASK(t, "job_completion().\n");
 
diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index 39a543e22d41..4ae14ac63c2e 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -169,6 +169,26 @@ feather_callback void do_sched_trace_task_completion(unsigned long id,
         }
 }
 
+feather_callback void do_sched_trace_task_completion_adaptive(unsigned long id,
+                                unsigned long _task)
+{
+        struct task_struct *t = (struct task_struct*) _task;
+        struct st_event_record* rec = get_record(ST_COMPLETION_ADAPTIVE, t);
+        if (rec) {
+                s32 err;
+                rec->data.completion_adaptive.estimated_exe = get_exec_cost_est(t);
+
+                err = _fp_to_integer(_mul(tsk_rt(t)->zl_accum_err, _frac(get_rt_period(t), 1)));
+                if((err < 0) && _point(tsk_rt(t)->zl_accum_err) < 0)
+                {
+                        err *= -1;
+                }
+                rec->data.completion_adaptive.accumulated_err = err;
+
+                put_record(rec);
+        }
+}
+
 feather_callback void do_sched_trace_task_block(unsigned long id,
                                                 unsigned long _task)
 {