1 files changed, 10 insertions, 4 deletions

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]