Fixed migration tracing. Added inject of ST_ACTION

1 files changed, 28 insertions, 23 deletions

diff --git a/litmus/sched_task_trace.c b/litmus/sched_task_trace.c
index d1df0127cfa4..e863eaf41b96 100644
--- a/litmus/sched_task_trace.c
+++ b/litmus/sched_task_trace.c
@@ -200,8 +200,21 @@ feather_callback void do_sched_trace_task_block(unsigned long id,
 {
         struct task_struct *t = (struct task_struct*) _task;
         struct st_event_record* rec = get_record(ST_BLOCK, t);
+
         if (rec) {
-                rec->data.block.when      = now();
+                rec->data.block.when = now();
+
+                // hiding is turned on by locking protocols, so if there isn't any
+                // hiding, then we're blocking for some other reason.  assume it's I/O.
+                rec->data.block.for_io = 0
+#ifdef CONFIG_REALTIME_AUX_TASKS
+                || (tsk_rt(t)->has_aux_tasks && !tsk_rt(t)->hide_from_aux_tasks)
+#endif
+#ifdef CONFIG_LITMUS_NVIDIA
+                || (tsk_rt(t)->held_gpus && !tsk_rt(t)->hide_from_gpu)
+#endif
+                ;
+
                 put_record(rec);
         }
 }
@@ -243,28 +256,6 @@ feather_callback void do_sched_trace_action(unsigned long id,
         }
 }
 
-
-
-
-feather_callback void do_sched_trace_prediction_err(unsigned long id,
-                                                                                                        unsigned long _task,
-                                                                                                        unsigned long _distance,
-                                                                                                        unsigned long _rel_err)
-{
-        struct task_struct *t = (struct task_struct*) _task;
-        struct st_event_record *rec = get_record(ST_PREDICTION_ERR, t);
-
-        if (rec) {
-                gpu_migration_dist_t* distance = (gpu_migration_dist_t*) _distance;
-                fp_t* rel_err = (fp_t*) _rel_err;
-
-                rec->data.prediction_err.distance = *distance;
-                rec->data.prediction_err.rel_err = rel_err->val;
-                put_record(rec);
-        }
-}
-
-
 feather_callback void do_sched_trace_migration(unsigned long id,
                                                                                                         unsigned long _task,
                                                                                                         unsigned long _mig_info)
@@ -285,7 +276,21 @@ feather_callback void do_sched_trace_migration(unsigned long id,
 
 
 
+feather_callback void do_sched_trace_lock(unsigned long id,
+                                                 unsigned long _task,
+                                                 unsigned long _lock_id,
+                                                 unsigned long _acquired)
+{
+        struct task_struct *t = (struct task_struct*) _task;
+        struct st_event_record *rec = get_record(ST_LOCK, t);
 
+        if (rec) {
+                rec->data.lock.when = now();
+                rec->data.lock.lock_id = _lock_id;
+                rec->data.lock.acquired = _acquired;
+                put_record(rec);
+        }
+}