1 files changed, 114 insertions, 109 deletions

diff --git a/rt-graph.c b/rt-graph.c
index d6b1847..ecb24cb 100644
--- a/rt-graph.c
+++ b/rt-graph.c
@@ -1,7 +1,7 @@
 #include "trace-graph.h"
 #include "trace-hash.h"
 
-#define DEBUG_LEVEL     4
+#define DEBUG_LEVEL 0
 #if DEBUG_LEVEL > 0
 #define dprintf(l, x...)                        \
         do {                                    \
@@ -61,7 +61,7 @@ add_ts_hash(struct ts_list **events, gint eid, gint key,
  * @epid: set to the event's task PID
  * @rt_ts: set to the event's real-time timestamp
  */
-int rt_graph_check_any(struct rt_graph_info *rtinfo,
+int rt_graph_check_any(struct rt_graph_info *rtg_info,
                        struct pevent *pevent, struct record *record,
                        gint *epid, gint *out_eid, unsigned long long *ts)
 {
@@ -70,10 +70,10 @@ int rt_graph_check_any(struct rt_graph_info *rtinfo,
 
         eid = pevent_data_type(pevent, record);
         key = get_event_hash_key(eid);
-        field = find_ts_hash(rtinfo->events, key, eid);
+        field = find_ts_hash(rtg_info->events, key, eid);
 
         if (!field)
-                field = add_ts_hash(rtinfo->events, eid, key, pevent, record);
+                field = add_ts_hash(rtg_info->events, eid, key, pevent, record);
 
         *epid = pevent_data_pid(pevent, record);
         pevent_read_number_field(field, record->data, ts);
@@ -88,7 +88,7 @@ int rt_graph_check_any(struct rt_graph_info *rtinfo,
  * rt_graph_check_task_param - check for litmus_task_param record
  * Return 1 and @pid, @wcet, and @period if the record matches
  */
-int rt_graph_check_task_param(struct rt_graph_info *rtinfo,
+int rt_graph_check_task_param(struct rt_graph_info *rtg_info,
                               struct pevent *pevent, struct record *record,
                               gint *pid, unsigned long long *wcet,
                               unsigned long long *period)
@@ -102,32 +102,35 @@ int rt_graph_check_task_param(struct rt_graph_info *rtinfo,
          * after the pevent has "seen" its first litmus_task_param
          * event.
          */
-        if (rtinfo->task_param_id < 0) {
+        if (rtg_info->task_param_id < 0) {
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_param");
                 if (!event)
                         goto out;
-                rtinfo->task_param_id = event->id;
+                rtg_info->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");
+                rtg_info->param_pid_field = pevent_find_field(event, "pid");
+                rtg_info->param_wcet_field = pevent_find_field(event, "wcet");
+                rtg_info->param_period_field = pevent_find_field(event, "period");
         }
 
         id = pevent_data_type(pevent, record);
-        if (id == rtinfo->task_param_id) {
-                pevent_read_number_field(rtinfo->param_pid_field,
+        if (id == rtg_info->task_param_id) {
+                pevent_read_number_field(rtg_info->param_pid_field,
                                          record->data, &val);
                 *pid = val;
-                pevent_read_number_field(rtinfo->param_wcet_field,
+                pevent_read_number_field(rtg_info->param_wcet_field,
                                          record->data, wcet);
-                pevent_read_number_field(rtinfo->param_period_field,
+                pevent_read_number_field(rtg_info->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);
 
-                add_task_hash(rtinfo->tasks, *pid);
+                add_task_hash(rtg_info->tasks, *pid);
+
+                if (*period > rtg_info->max_period)
+                        rtg_info->max_period = *period;
         }
  out:
         return ret;
@@ -137,7 +140,7 @@ int rt_graph_check_task_param(struct rt_graph_info *rtinfo,
  * rt_graph_check_switch_to - check for litmus_switch_to record
  * Return 1 and @pid, @job, and @ts if the record matches
  */
-int rt_graph_check_switch_to(struct rt_graph_info *rtinfo,
+int rt_graph_check_switch_to(struct rt_graph_info *rtg_info,
                                   struct pevent *pevent, struct record *record,
                                   gint *pid, gint *job,
                                   unsigned long long *ts)
@@ -147,27 +150,27 @@ int rt_graph_check_switch_to(struct rt_graph_info *rtinfo,
         gint id;
         int ret = 0;
 
-        if (rtinfo->switch_to_id < 0) {
+        if (rtg_info->switch_to_id < 0) {
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_switch_to");
                 if (!event)
                         goto out;
-                rtinfo->switch_to_id = event->id;
+                rtg_info->switch_to_id = event->id;
                 dprintf(2, "Found switch_to id %d\n", event->id);
-                rtinfo->switch_to_pid_field = pevent_find_field(event, "pid");
-                rtinfo->switch_to_job_field = pevent_find_field(event, "job");
-                rtinfo->switch_to_ts_field = pevent_find_field(event, RT_TS_FIELD);
+                rtg_info->switch_to_pid_field = pevent_find_field(event, "pid");
+                rtg_info->switch_to_job_field = pevent_find_field(event, "job");
+                rtg_info->switch_to_ts_field = pevent_find_field(event, RT_TS_FIELD);
         }
 
         id = pevent_data_type(pevent, record);
-        if (id == rtinfo->switch_to_id) {
-                pevent_read_number_field(rtinfo->switch_to_pid_field,
+        if (id == rtg_info->switch_to_id) {
+                pevent_read_number_field(rtg_info->switch_to_pid_field,
                                          record->data, &val);
                 *pid = val;
-                pevent_read_number_field(rtinfo->switch_to_job_field,
+                pevent_read_number_field(rtg_info->switch_to_job_field,
                                          record->data, &val);
                 *job = val;
-                pevent_read_number_field(rtinfo->switch_to_ts_field,
+                pevent_read_number_field(rtg_info->switch_to_ts_field,
                                          record->data, ts);
                 ret = 1;
                 dprintf(3, "Read switch_to (%d) record for job %d:%d, "
@@ -181,7 +184,7 @@ int rt_graph_check_switch_to(struct rt_graph_info *rtinfo,
  * rt_graph_check_switch_away - check for litmus_switch_away record
  * Return 1 and @pid, @job, and @ts if the record matches
  */
-int rt_graph_check_switch_away(struct rt_graph_info *rtinfo,
+int rt_graph_check_switch_away(struct rt_graph_info *rtg_info,
                                     struct pevent *pevent, struct record *record,
                                     gint *pid, gint *job,
                                     unsigned long long *ts)
@@ -191,27 +194,27 @@ int rt_graph_check_switch_away(struct rt_graph_info *rtinfo,
         gint id;
         int ret = 0;
 
-        if (rtinfo->switch_away_id < 0) {
+        if (rtg_info->switch_away_id < 0) {
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_switch_away");
                 if (!event)
                         goto out;
-                rtinfo->switch_away_id = event->id;
+                rtg_info->switch_away_id = event->id;
                 dprintf(2, "Found switch_away id %d\n", event->id);
-                rtinfo->switch_away_pid_field = pevent_find_field(event, "pid");
-                rtinfo->switch_away_job_field = pevent_find_field(event, "job");
-                rtinfo->switch_away_ts_field = pevent_find_field(event, RT_TS_FIELD);
+                rtg_info->switch_away_pid_field = pevent_find_field(event, "pid");
+                rtg_info->switch_away_job_field = pevent_find_field(event, "job");
+                rtg_info->switch_away_ts_field = pevent_find_field(event, RT_TS_FIELD);
         }
 
         id = pevent_data_type(pevent, record);
-        if (id == rtinfo->switch_away_id) {
-                pevent_read_number_field(rtinfo->switch_away_pid_field,
+        if (id == rtg_info->switch_away_id) {
+                pevent_read_number_field(rtg_info->switch_away_pid_field,
                                          record->data, &val);
                 *pid = val;
-                pevent_read_number_field(rtinfo->switch_away_job_field,
+                pevent_read_number_field(rtg_info->switch_away_job_field,
                                          record->data, &val);
                 *job = val;
-                pevent_read_number_field(rtinfo->switch_away_ts_field,
+                pevent_read_number_field(rtg_info->switch_away_ts_field,
                                          record->data, ts);
                 ret = 1;
                 dprintf(3, "Read switch_away (%d) record for job %d:%d, "
@@ -225,7 +228,7 @@ int rt_graph_check_switch_away(struct rt_graph_info *rtinfo,
  * rt_graph_check_task_release - check for litmus_task_release record
  * Return 1 and @pid, @job, @release, and @deadline if the record matches
  */
-int rt_graph_check_task_release(struct rt_graph_info *rtinfo,
+int rt_graph_check_task_release(struct rt_graph_info *rtg_info,
                                 struct pevent *pevent, struct record *record,
                                 gint *pid, gint *job,
                                 unsigned long long *release,
@@ -236,30 +239,30 @@ int rt_graph_check_task_release(struct rt_graph_info *rtinfo,
         gint id;
         int ret = 0;
 
-        if (rtinfo->task_release_id < 0) {
+        if (rtg_info->task_release_id < 0) {
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_release");
                 if (!event)
                         goto out;
-                rtinfo->task_release_id = event->id;
+                rtg_info->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");
+                rtg_info->release_pid_field = pevent_find_field(event, "pid");
+                rtg_info->release_job_field = pevent_find_field(event, "job");
+                rtg_info->release_release_field = pevent_find_field(event, "release");
+                rtg_info->release_deadline_field = pevent_find_field(event, "deadline");
         }
 
         id = pevent_data_type(pevent, record);
-        if (id == rtinfo->task_release_id) {
-                pevent_read_number_field(rtinfo->release_pid_field,
+        if (id == rtg_info->task_release_id) {
+                pevent_read_number_field(rtg_info->release_pid_field,
                                          record->data, &val);
                 *pid = val;
-                pevent_read_number_field(rtinfo->release_job_field,
+                pevent_read_number_field(rtg_info->release_job_field,
                                          record->data, &val);
                 *job = val;
-                pevent_read_number_field(rtinfo->release_release_field,
+                pevent_read_number_field(rtg_info->release_release_field,
                                          record->data, release);
-                pevent_read_number_field(rtinfo->release_deadline_field,
+                pevent_read_number_field(rtg_info->release_deadline_field,
                                          record->data, deadline);
                 ret = 1;
                 dprintf(3, "Read task_release (%d) record for job %d:%d, "
@@ -274,7 +277,7 @@ int rt_graph_check_task_release(struct rt_graph_info *rtinfo,
  * rt_graph_check_task_completion - check for litmus_task_completion record
  * Return 1 and @pid, @job, and @ts if the record matches
  */
-int rt_graph_check_task_completion(struct rt_graph_info *rtinfo,
+int rt_graph_check_task_completion(struct rt_graph_info *rtg_info,
                                    struct pevent *pevent, struct record *record,
                                    gint *pid, gint *job, unsigned long long *ts)
 {
@@ -283,27 +286,27 @@ int rt_graph_check_task_completion(struct rt_graph_info *rtinfo,
         gint id;
         int ret = 0;
 
-        if (rtinfo->task_completion_id < 0) {
+        if (rtg_info->task_completion_id < 0) {
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_completion");
                 if (!event)
                         goto out;
-                rtinfo->task_completion_id = event->id;
+                rtg_info->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_ts_field = pevent_find_field(event, RT_TS_FIELD);
+                rtg_info->completion_pid_field = pevent_find_field(event, "pid");
+                rtg_info->completion_job_field = pevent_find_field(event, "job");
+                rtg_info->completion_ts_field = pevent_find_field(event, RT_TS_FIELD);
         }
 
         id = pevent_data_type(pevent, record);
-        if (id == rtinfo->task_completion_id) {
-                pevent_read_number_field(rtinfo->completion_pid_field,
+        if (id == rtg_info->task_completion_id) {
+                pevent_read_number_field(rtg_info->completion_pid_field,
                                          record->data, &val);
                 *pid = val;
-                pevent_read_number_field(rtinfo->completion_job_field,
+                pevent_read_number_field(rtg_info->completion_job_field,
                                          record->data, &val);
                 *job = val;
-                pevent_read_number_field(rtinfo->completion_ts_field,
+                pevent_read_number_field(rtg_info->completion_ts_field,
                                          record->data, ts);
                 ret = 1;
                 dprintf(3, "Read task_completion (%d) record for job %d:%d "
@@ -317,7 +320,7 @@ int rt_graph_check_task_completion(struct rt_graph_info *rtinfo,
  * rt_graph_check_task_block - check for litmus_task_block record
  * Return 1, @pid, and @ts if the record matches
  */
-int rt_graph_check_task_block(struct rt_graph_info *rtinfo,
+int rt_graph_check_task_block(struct rt_graph_info *rtg_info,
                               struct pevent *pevent, struct record *record,
                               gint *pid, unsigned long long *ts)
 {
@@ -326,23 +329,23 @@ int rt_graph_check_task_block(struct rt_graph_info *rtinfo,
         gint id;
         int ret = 0;
 
-        if (rtinfo->task_block_id < 0) {
+        if (rtg_info->task_block_id < 0) {
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_block");
                 if (!event)
                         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_ts_field = pevent_find_field(event, RT_TS_FIELD);
+                rtg_info->task_block_id = event->id;
+                rtg_info->block_pid_field = pevent_find_field(event, "pid");
+                rtg_info->block_ts_field = pevent_find_field(event, RT_TS_FIELD);
         }
 
         id = pevent_data_type(pevent, record);
-        if (id == rtinfo->task_block_id) {
-                pevent_read_number_field(rtinfo->block_pid_field,
+        if (id == rtg_info->task_block_id) {
+                pevent_read_number_field(rtg_info->block_pid_field,
                                          record->data, &val);
                 *pid = val;
-                pevent_read_number_field(rtinfo->block_ts_field,
+                pevent_read_number_field(rtg_info->block_ts_field,
                                          record->data, ts);
                 ret = 1;
                 dprintf(3, "Read task_block (%d) record for task %d\n",
@@ -356,7 +359,7 @@ int rt_graph_check_task_block(struct rt_graph_info *rtinfo,
  * rt_graph_check_task_resume - check for litmus_task_resume record
  * Return 1 and @pid if the record matches
  */
-int rt_graph_check_task_resume(struct rt_graph_info *rtinfo,
+int rt_graph_check_task_resume(struct rt_graph_info *rtg_info,
                                struct pevent *pevent, struct record *record,
                                gint *pid, unsigned long long *ts)
 {
@@ -365,23 +368,23 @@ int rt_graph_check_task_resume(struct rt_graph_info *rtinfo,
         gint id;
         int ret = 0;
 
-        if (rtinfo->task_resume_id < 0) {
+        if (rtg_info->task_resume_id < 0) {
                 event = pevent_find_event_by_name(pevent, "litmus",
                                                   "litmus_task_resume");
                 if (!event)
                         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_ts_field = pevent_find_field(event, RT_TS_FIELD);
+                rtg_info->task_resume_id = event->id;
+                rtg_info->resume_pid_field = pevent_find_field(event, "pid");
+                rtg_info->resume_ts_field = pevent_find_field(event, RT_TS_FIELD);
         }
 
         id = pevent_data_type(pevent, record);
-        if (id == rtinfo->task_resume_id) {
-                pevent_read_number_field(rtinfo->resume_pid_field,
+        if (id == rtg_info->task_resume_id) {
+                pevent_read_number_field(rtg_info->resume_pid_field,
                                          record->data, &val);
                 *pid = val;
-                pevent_read_number_field(rtinfo->resume_ts_field,
+                pevent_read_number_field(rtg_info->resume_ts_field,
                                          record->data, ts);
                 ret = 1;
                 dprintf(3, "Read task_resume (%d) record for task %d\n",
@@ -394,43 +397,45 @@ int rt_graph_check_task_resume(struct rt_graph_info *rtinfo,
 /**
  * init_rt_event_cache - reset cached field values
  */
-void init_rt_event_cache(struct rt_graph_info *rtinfo)
+void init_rt_event_cache(struct rt_graph_info *rtg_info)
 {
         dprintf(1, "Initializing RT event cache\n");
-        rtinfo->task_param_id = -1;
-        rtinfo->switch_to_id = -1;
-        rtinfo->switch_away_id = -1;
-        rtinfo->task_release_id = -1;
-        rtinfo->task_completion_id = -1;
-        rtinfo->task_block_id = -1;
-        rtinfo->task_resume_id = -1;
-
-        rtinfo->param_pid_field = NULL;
-        rtinfo->param_wcet_field = NULL;
-        rtinfo->param_period_field = NULL;
-
-        rtinfo->switch_to_pid_field = NULL;
-        rtinfo->switch_to_job_field = NULL;
-        rtinfo->switch_to_ts_field = NULL;
-
-        rtinfo->switch_away_pid_field = NULL;
-        rtinfo->switch_away_job_field = NULL;
-        rtinfo->switch_away_ts_field = NULL;
-
-        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_ts_field = NULL;
-
-        rtinfo->block_pid_field = NULL;
-        rtinfo->block_ts_field = NULL;
-
-        rtinfo->resume_pid_field = NULL;
-        rtinfo->resume_ts_field = NULL;
+        rtg_info->task_param_id = -1;
+        rtg_info->switch_to_id = -1;
+        rtg_info->switch_away_id = -1;
+        rtg_info->task_release_id = -1;
+        rtg_info->task_completion_id = -1;
+        rtg_info->task_block_id = -1;
+        rtg_info->task_resume_id = -1;
+
+        rtg_info->max_period = 0;
+
+        rtg_info->param_pid_field = NULL;
+        rtg_info->param_wcet_field = NULL;
+        rtg_info->param_period_field = NULL;
+
+        rtg_info->switch_to_pid_field = NULL;
+        rtg_info->switch_to_job_field = NULL;
+        rtg_info->switch_to_ts_field = NULL;
+
+        rtg_info->switch_away_pid_field = NULL;
+        rtg_info->switch_away_job_field = NULL;
+        rtg_info->switch_away_ts_field = NULL;
+
+        rtg_info->release_pid_field = NULL;
+        rtg_info->release_job_field = NULL;
+        rtg_info->release_release_field = NULL;
+        rtg_info->release_deadline_field = NULL;
+
+        rtg_info->completion_pid_field = NULL;
+        rtg_info->completion_job_field = NULL;
+        rtg_info->completion_ts_field = NULL;
+
+        rtg_info->block_pid_field = NULL;
+        rtg_info->block_ts_field = NULL;
+
+        rtg_info->resume_pid_field = NULL;
+        rtg_info->resume_ts_field = NULL;
 }
 
 /**
@@ -445,7 +450,7 @@ get_rts(struct graph_info *ginfo, struct record *record)
         gint epid, eid;
         unsigned long long ts;
         if (!record->cached_rts) {
-                rt_graph_check_any(&ginfo->rtinfo, ginfo->pevent, record,
+                rt_graph_check_any(&ginfo->rtg_info, ginfo->pevent, record,
                                    &epid, &eid, &ts);
                 record->cached_rts = ts;
         } else