1 files changed, 62 insertions, 16 deletions

diff --git a/rt-graph.c b/rt-graph.c
index 6eab52f..71f2033 100644
--- a/rt-graph.c
+++ b/rt-graph.c
@@ -1,5 +1,16 @@
 #include "rt-graph.h"
+#include "trace-hash.h"
 
+#define DEBUG_LEVEL     1
+#if DEBUG_LEVEL > 0
+#define dprintf(l, x...)                        \
+        do {                                    \
+                if (l <= DEBUG_LEVEL)           \
+                        printf(x);              \
+        } while (0)
+#else
+#define dprintf(l, x...)        do { if (0) printf(x); } while (0)
+#endif
 /**
  * rt_graph_check_task_param - check for litmus_task_param record
  * Return 1 and @pid, @wcet, and @period if the record matches
@@ -22,8 +33,9 @@ int rt_graph_check_task_param(struct rt_graph_info *rtinfo,
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_param");
                 if (!event)
-                        return 0;
+                        goto out;
                 rtinfo->task_param_id = event->id;
+                dprintf(2, "Found task_param id %d\n", event->id);
                 rtinfo->param_pid_field = pevent_find_field(event, "pid");
                 rtinfo->param_wcet_field = pevent_find_field(event, "wcet");
                 rtinfo->param_period_field = pevent_find_field(event, "period");
@@ -39,8 +51,13 @@ int rt_graph_check_task_param(struct rt_graph_info *rtinfo,
                 pevent_read_number_field(rtinfo->param_period_field,
                                          record->data, period);
                 ret = 1;
-        }
+                dprintf(3, "Read task_param (%d) record for task %d "
+                        "(%llu, %llu)\n", id, *pid, *wcet, *period);
 
+                /* Only of these per task, so we can safely add new tasks now */
+                add_task_hash(rtinfo->tasks, *pid);
+        }
+ out:
         return ret;
 }
 
@@ -50,7 +67,7 @@ int rt_graph_check_task_param(struct rt_graph_info *rtinfo,
  */
 int rt_graph_check_task_release(struct rt_graph_info *rtinfo,
                                 struct pevent *pevent, struct record *record,
-                                gint *pid, gint *job,
+                                gint *pid, gint *job, unsigned long long *release,
                                 unsigned long long *deadline)
 {
         struct event_format *event;
@@ -62,10 +79,12 @@ int rt_graph_check_task_release(struct rt_graph_info *rtinfo,
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_release");
                 if (!event)
-                        return 0;
+                        goto out;
                 rtinfo->task_release_id = event->id;
+                dprintf(2, "Found task_release id %d\n", event->id);
                 rtinfo->release_pid_field = pevent_find_field(event, "pid");
                 rtinfo->release_job_field = pevent_find_field(event, "job");
+                rtinfo->release_release_field = pevent_find_field(event, "release");
                 rtinfo->release_deadline_field = pevent_find_field(event, "deadline");
         }
 
@@ -77,11 +96,15 @@ int rt_graph_check_task_release(struct rt_graph_info *rtinfo,
                 pevent_read_number_field(rtinfo->release_job_field,
                                          record->data, &val);
                 *job = val;
+                pevent_read_number_field(rtinfo->release_release_field,
+                                         record->data, release);
                 pevent_read_number_field(rtinfo->release_deadline_field,
                                          record->data, deadline);
                 ret = 1;
+                dprintf(3, "Read task_release (%d) record for job %d:%d, "
+                        "dead: %llu\n", id, *pid, *job, *deadline);
         }
-
+ out:
         return ret;
 }
 
@@ -91,21 +114,23 @@ int rt_graph_check_task_release(struct rt_graph_info *rtinfo,
  */
 int rt_graph_check_task_completion(struct rt_graph_info *rtinfo,
                                    struct pevent *pevent, struct record *record,
-                                   gint *pid, gint *job)
+                                   gint *pid, gint *job, unsigned long long *when)
 {
         struct event_format *event;
         unsigned long long val;
         gint id;
         int ret = 0;
 
-        if (rtinfo->task_param_id < 0) {
+        if (rtinfo->task_completion_id < 0) {
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_completion");
                 if (!event)
-                        return 0;
+                        goto out;
                 rtinfo->task_completion_id = event->id;
+                dprintf(2, "Found task_completion id %d\n", event->id);
                 rtinfo->completion_pid_field = pevent_find_field(event, "pid");
                 rtinfo->completion_job_field = pevent_find_field(event, "job");
+                rtinfo->completion_when_field = pevent_find_field(event, "when");
         }
 
         id = pevent_data_type(pevent, record);
@@ -116,9 +141,13 @@ int rt_graph_check_task_completion(struct rt_graph_info *rtinfo,
                 pevent_read_number_field(rtinfo->completion_job_field,
                                          record->data, &val);
                 *job = val;
+                pevent_read_number_field(rtinfo->completion_when_field,
+                                         record->data, when);
                 ret = 1;
+                dprintf(3, "Read task_completion (%d) record for job %d:%d\n",
+                        id, *pid, *job);
         }
-
+ out:
         return ret;
 }
 
@@ -128,7 +157,7 @@ int rt_graph_check_task_completion(struct rt_graph_info *rtinfo,
  */
 int rt_graph_check_task_block(struct rt_graph_info *rtinfo,
                               struct pevent *pevent, struct record *record,
-                              gint *pid)
+                              gint *pid, unsigned long long *when)
 {
         struct event_format *event;
         unsigned long long val;
@@ -139,9 +168,11 @@ int rt_graph_check_task_block(struct rt_graph_info *rtinfo,
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_block");
                 if (!event)
-                        return 0;
+                        goto out;
+                dprintf(2, "Found task_block id %d\n", event->id);
                 rtinfo->task_block_id = event->id;
                 rtinfo->block_pid_field = pevent_find_field(event, "pid");
+                rtinfo->block_when_field = pevent_find_field(event, "when");
         }
 
         id = pevent_data_type(pevent, record);
@@ -149,9 +180,13 @@ int rt_graph_check_task_block(struct rt_graph_info *rtinfo,
                 pevent_read_number_field(rtinfo->block_pid_field,
                                          record->data, &val);
                 *pid = val;
+                pevent_read_number_field(rtinfo->block_when_field,
+                                         record->data, when);
                 ret = 1;
+                dprintf(3, "Read task_block (%d) record for task %d\n",
+                        id, *pid);
         }
-
+ out:
         return ret;
 }
 
@@ -161,7 +196,7 @@ int rt_graph_check_task_block(struct rt_graph_info *rtinfo,
  */
 int rt_graph_check_task_resume(struct rt_graph_info *rtinfo,
                                struct pevent *pevent, struct record *record,
-                               gint *pid)
+                               gint *pid, unsigned long long *when)
 {
         struct event_format *event;
         unsigned long long val;
@@ -172,9 +207,11 @@ int rt_graph_check_task_resume(struct rt_graph_info *rtinfo,
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_resume");
                 if (!event)
-                        return 0;
+                        goto out;
+                dprintf(2, "Found task_resume id %d\n", event->id);
                 rtinfo->task_resume_id = event->id;
                 rtinfo->resume_pid_field = pevent_find_field(event, "pid");
+                rtinfo->resume_when_field = pevent_find_field(event, "when");
         }
 
         id = pevent_data_type(pevent, record);
@@ -182,9 +219,13 @@ int rt_graph_check_task_resume(struct rt_graph_info *rtinfo,
                 pevent_read_number_field(rtinfo->resume_pid_field,
                                          record->data, &val);
                 *pid = val;
+                pevent_read_number_field(rtinfo->resume_when_field,
+                                         record->data, when);
                 ret = 1;
+                dprintf(3, "Read task_resume (%d) record for task %d\n",
+                        id, *pid);
         }
-
+ out:
         return ret;
 }
 
@@ -193,7 +234,7 @@ int rt_graph_check_task_resume(struct rt_graph_info *rtinfo,
  */
 void init_rt_event_cache(struct rt_graph_info *rtinfo)
 {
-        print("hello");
+        dprintf(1, "Initializing RT event cache\n");
         rtinfo->task_param_id = -1;
         rtinfo->task_release_id = -1;
         rtinfo->task_completion_id = -1;
@@ -206,11 +247,16 @@ void init_rt_event_cache(struct rt_graph_info *rtinfo)
 
         rtinfo->release_pid_field = NULL;
         rtinfo->release_job_field = NULL;
+        rtinfo->release_release_field = NULL;
         rtinfo->release_deadline_field = NULL;
 
         rtinfo->completion_pid_field = NULL;
         rtinfo->completion_job_field = NULL;
+        rtinfo->completion_when_field = NULL;
 
         rtinfo->block_pid_field = NULL;
+        rtinfo->block_when_field = NULL;
+
         rtinfo->resume_pid_field = NULL;
+        rtinfo->resume_when_field = NULL;
 }