Summarize schedulability with final record

Conflicts:

	include/litmus/rt_param.h
	litmus/sched_color.c

3 files changed, 36 insertions, 1 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 8c996b91ead8..20268190757f 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -226,6 +226,9 @@ struct rt_param {
         /* Pointer to the page shared between userspace and kernel. */
         struct control_page * ctrl_page;
 
+        lt_t            total_tardy;
+        lt_t            max_tardy;
+        unsigned int    missed;
         lt_t max_exec_time;
         lt_t tot_exec_time;
 };
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index f910c63c067a..bf6c4cf4316c 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -85,6 +85,12 @@ struct st_task_exit_data {
         u64     max_exec_time;
 };
 
+struct st_task_tardy_data {
+        u64     total_tardy;
+        u32     max_tardy;
+        u32     missed;
+};
+
 #define DATA(x) struct st_ ## x ## _data x;
 
 typedef enum {
@@ -101,6 +107,7 @@ typedef enum {
         ST_ACTION,
         ST_SYS_RELEASE,
         ST_TASK_EXIT,
+        ST_TASK_TARDY,
 } st_event_record_type_t;
 
 struct st_event_record {
@@ -120,6 +127,7 @@ struct st_event_record {
                 DATA(action);
                 DATA(sys_release);
                 DATA(task_exit);
+                DATA(task_tardy);
         } data;
 };
 
@@ -163,6 +171,8 @@ 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);
+feather_callback void do_sched_trace_task_tardy(unsigned long id,
+                                                     struct task_struct* task);
 
 #endif
 
@@ -189,6 +199,7 @@ feather_callback void do_sched_trace_task_exit(unsigned long id,
 #define trace_litmus_task_resume(t)
 #define trace_litmus_sys_release(start)
 #define trace_litmus_task_exit(t)
+#define trace_litmus_task_tardy(t)
 
 #define trace_litmus_container_param(cid, name)
 #define trace_litmus_server_param(sid, cid, wcet, time)
@@ -292,6 +303,14 @@ feather_callback void do_sched_trace_task_exit(unsigned long id,
                 trace_litmus_task_exit(t);                              \
         } while (0)
 
+
+#define sched_trace_task_tardy(t)                                       \
+        do {                                                            \
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 12,                   \
+                        do_sched_trace_task_tardy, t);                  \
+                trace_litmus_task_tardy(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/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index c65c021ec809..60a3e8e5c028 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -227,7 +227,7 @@ 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)
+                                               unsigned long _task)
 {
         struct task_struct *t = (struct task_struct*) _task;
         const lt_t max_exec_time = tsk_rt(t)->max_exec_time;
@@ -241,6 +241,19 @@ feather_callback void do_sched_trace_task_exit(unsigned long id,
         }
 }
 
+feather_callback void do_sched_trace_task_tardy(unsigned long id,
+                                               unsigned long _task)
+{
+        struct task_struct *t = (struct task_struct*) _task;
+        struct st_event_record *rec = get_record(ST_TASK_TARDY, t);
+        if (rec) {
+                rec->data.task_tardy.max_tardy = tsk_rt(t)->max_tardy;
+                rec->data.task_tardy.total_tardy = tsk_rt(t)->total_tardy;
+                rec->data.task_tardy.missed = tsk_rt(t)->missed;
+                put_record(rec);
+        }
+}
+
 feather_callback void do_sched_trace_action(unsigned long id,
                                             unsigned long _task,
                                             unsigned long action)