Added support for visualizing arbitrary actions.wip-events

6 files changed, 263 insertions, 52 deletions

diff --git a/unit_trace/sanitizer.py b/unit_trace/sanitizer.py
index 598379a..fc66170 100644
--- a/unit_trace/sanitizer.py
+++ b/unit_trace/sanitizer.py
@@ -14,6 +14,8 @@ def sanitizer(stream):
     job_2s_released = [] # list of tasks which have released their job 2s
     jobs_switched_to = []
 
+    released = False
+
     for record in stream:
 
         # Ignore records which are not events (e.g. the num_cpus record)
@@ -21,6 +23,13 @@ def sanitizer(stream):
             yield record
             continue
 
+        if record.type_name == 'release':
+            released = released or True
+
+        if record.type_name == 'action' and released:
+            yield record
+            continue
+
         # All records with job < 2 are garbage
         if record.job < 2:
             continue
@@ -50,4 +59,5 @@ def sanitizer(stream):
             if (record.pid,record.job) not in jobs_switched_to:
                 record.job -= 1
 
+
         yield record
diff --git a/unit_trace/trace_reader.py b/unit_trace/trace_reader.py
index a4c3c05..fe5c03c 100644
--- a/unit_trace/trace_reader.py
+++ b/unit_trace/trace_reader.py
@@ -93,7 +93,6 @@ def trace_reader(files):
 
     # Keep pulling records as long as we have a buffer
     while len(file_iter_buff) > 0:
-
         # Select the earliest record from those at the heads of the buffers
         earliest = -1
         buff_to_refill = -1
@@ -120,7 +119,8 @@ def trace_reader(files):
                 del file_iters[buff_to_refill]
 
         # Check for monotonically increasing time
-        if last_time is not None and earliest.when < last_time:
+        if last_time is not None and earliest.when != 0 and earliest.when < last_time:
+            print("FATAL Old: %s, New: %s" % (last_time, earliest.when))
             exit("FATAL ERROR: trace_reader.py: out-of-order record produced")
         else:
             last_time = earliest.when
@@ -203,6 +203,12 @@ class StHeader:
     keys = ['type','cpu','pid','job']
     message = 'The header.'
 
+class StActionData:
+    format =  'Qb'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['when','action']
+    message = 'An action was performed.'
+
 class StNameData:
     format =  '16s'
     formatStr = struct.Struct(StHeader.format + format)
@@ -269,7 +275,7 @@ class StSysReleaseData:
 def _get_type(type_num):
     types = [None,StNameData,StParamData,StReleaseData,StAssignedData,
              StSwitchToData,StSwitchAwayData,StCompletionData,StBlockData,
-             StResumeData,StSysReleaseData]
+             StResumeData,StActionData,StSysReleaseData]
     if type_num > len(types)-1 or type_num < 1:
         raise Exception
     return types[type_num]
@@ -278,5 +284,5 @@ def _get_type(type_num):
 #     programmers of other modules)
 def _get_type_name(type_num):
     type_names = [None,"name","params","release","assign","switch_to",
-        "switch_away","completion","block","resume","sys_release"]
+        "switch_away","completion","block","resume","action","sys_release"]
     return type_names[type_num]
diff --git a/unit_trace/viz/canvas.py b/unit_trace/viz/canvas.py
index badebe9..2c977ae 100644
--- a/unit_trace/viz/canvas.py
+++ b/unit_trace/viz/canvas.py
@@ -521,14 +521,44 @@ class Canvas(object):
         self.add_sel_region(SelectableRegion(x - big_arrowhead_height / Canvas.SQRT3,
             y, 2.0 * big_arrowhead_height / Canvas.SQRT3, height, event))
 
+    def draw_action_symbol(self, item, action, x, y, height, selected):
+        """Draws a release arrow: x, y should give the top (northernmost
+        point) of the arrow. The height includes the arrowhead."""
+
+        color = {False : GraphFormat.BORDER_COLOR,
+                 True : GraphFormat.HIGHLIGHT_COLOR}[selected]
+
+        colors = [self.get_bar_pattern(item).get_color_list()[0], color]
+        draw_funcs = [self.__class__.fill_polyline, self.__class__.draw_polyline]
+
+        for i in range(0, 2):
+            color = colors[i]
+            draw_func = draw_funcs[i]
+
+            draw_func(self, [(x, y), (x - height / Canvas.SQRT3, \
+                        y - height), \
+                        (x + height / Canvas.SQRT3, \
+                        y - height), \
+                        (x, y)], color, GraphFormat.BORDER_THICKNESS)
+
+        self.draw_label(str(action), x, y - height / 2 - .1 * height,
+                        GraphFormat.DEF_FOPTS_LABEL,
+                        AlignMode.CENTER, AlignMode.CENTER, True)
+
+    def add_sel_action_symbol(self, x, y, height, event):
+        self.add_sel_region(SelectableRegion(x - height / Canvas.SQRT3,
+            y - height, 2.0 * height / Canvas.SQRT3, height, event))
+
     def draw_release_arrow_small(self, x, y, height, selected):
         """Draws a small release arrow (most likely coming off the x-axis, although
         this method doesn't enforce this): x, y should give the top of the arrow"""
         small_arrowhead_height = GraphFormat.SMALL_ARROWHEAD_FACTOR * height
 
-        color = {False : GraphFormat.BORDER_COLOR, True : GraphFormat.HIGHLIGHT_COLOR}[selected]
+        color = {False : GraphFormat.BORDER_COLOR, 
+                 True : GraphFormat.HIGHLIGHT_COLOR}[selected]
 
-        self.draw_line((x, y), (x - small_arrowhead_height, y + small_arrowhead_height), \
+        self.draw_line((x, y),
+                       (x - small_arrowhead_height, y + small_arrowhead_height),
                        color, GraphFormat.BORDER_THICKNESS)
         self.draw_line((x, y), (x + small_arrowhead_height, y + small_arrowhead_height), \
                        color, GraphFormat.BORDER_THICKNESS)
@@ -754,13 +784,35 @@ class CairoCanvas(Canvas):
         self.surface.ctx.set_line_width(thickness * self.scale)
         self.surface.ctx.stroke()
 
+    def draw_circle(self, x, y, radius, fill_color, border_color,
+                     thickness, do_snap=True):
+        p = self.surface.get_real_coor(x, y)
+        if do_snap:
+            p = (snap(p[0]), snap(p[1]))
+
+        self.surface.ctx.save()
+        self.surface.ctx.arc(p[0], p[1], radius, 0.0, 2 * math.pi)
+        self.surface.ctx.set_source_rgb(border_color[0],
+                                        border_color[1],
+                                        border_color[2])
+        self.surface.ctx.set_line_width(thickness * self.scale)
+        self.surface.ctx.stroke()
+        self.surface.ctx.arc(p[0], p[1], radius, 0.0, 2 * math.pi)
+        self.surface.ctx.set_source_rgb(fill_color[0],
+                                        fill_color[1],
+                                        fill_color[2])
+        self.surface.ctx.fill()
+        self.surface.ctx.restore()
+
     def _polyline_common(self, coor_list, color, thickness, do_snap=True):
-        real_coor_list = [self.surface.get_real_coor(coor[0], coor[1]) for coor in coor_list]
+        real_coor_list = [self.surface.get_real_coor(coor[0], coor[1]) \
+                          for coor in coor_list]
 
         self.surface.ctx.move_to(real_coor_list[0][0], real_coor_list[0][1])
         if do_snap:
             for i in range(0, len(real_coor_list)):
-                real_coor_list[i] = (snap(real_coor_list[i][0]), snap(real_coor_list[i][1]))
+                real_coor_list[i] = (snap(real_coor_list[i][0]),
+                                     snap(real_coor_list[i][1]))
 
         for coor in real_coor_list[1:]:
             self.surface.ctx.line_to(coor[0], coor[1])
@@ -830,7 +882,8 @@ class CairoCanvas(Canvas):
                                           f_descent_factor, width_factor, f_height_factor,
                                           do_snap)
 
-    def draw_label(self, text, x, y, fopts=GraphFormat.DEF_FOPTS_LABEL, halign=AlignMode.LEFT, valign=AlignMode.BOTTOM, do_snap=True):
+    def draw_label(self, text, x, y, fopts=GraphFormat.DEF_FOPTS_LABEL,
+                   halign=AlignMode.LEFT, valign=AlignMode.BOTTOM, do_snap=True):
         """Draws a label with the given parameters, with the given horizontal and vertical justification."""