some video stuff

2 files changed, 9 insertions, 4 deletions

diff --git a/unit_trace/trace_reader.py b/unit_trace/trace_reader.py
index 6947de2..60450a6 100644
--- a/unit_trace/trace_reader.py
+++ b/unit_trace/trace_reader.py
@@ -120,7 +120,8 @@ def trace_reader(files):
 
         # Check for monotonically increasing time
         if last_time is not None and earliest.when != 0 and earliest.when < last_time:
-            exit("FATAL ERROR: trace_reader.py: out-of-order record produced")
+            #exit("FATAL ERROR: trace_reader.py: out-of-order record produced")
+            None
         else:
             last_time = earliest.when
 
@@ -155,7 +156,7 @@ def _get_file_iter(file):
                 type.format,data)
             record_dict = dict(zip(type.keys,values))
         except struct.error:
-            f.close()
+            #f.close()
             sys.stderr.write("Skipping record that does not match proper" +
                 " struct formatting\n")
             continue
@@ -203,7 +204,7 @@ class StHeader:
     message = 'The header.'
 
 class StActionData:
-    format =  'Qb'
+    format =  'QH'
     formatStr = struct.Struct(StHeader.format + format)
     keys = StHeader.keys + ['when','action']
     message = 'An action was performed.'
diff --git a/unit_trace/viz/schedule.py b/unit_trace/viz/schedule.py
index 53854f3..2c12d29 100644
--- a/unit_trace/viz/schedule.py
+++ b/unit_trace/viz/schedule.py
@@ -384,6 +384,8 @@ class Task(object):
         return self.partition
 
     def get_period(self):
+        if self.period is None:
+            return 0
         return self.period
 
     def get_phase(self):
@@ -396,6 +398,8 @@ class Task(object):
         return self.task_no
 
     def get_wcet(self):
+        if self.wcet is None:
+            return 0
         return self.wcet
 
     def set_params(self, wcet, period, phase = None, partition = None, 
@@ -410,7 +414,7 @@ class Task(object):
         ret = 'Task Name: ' + str(self.get_name()) + \
             '\n(WCET, Period): (' + _format_time(self.get_wcet(), unit) + \
             ", " + _format_time(self.get_period(), unit) + ")"
-        
+
         if self.schedule.show_class():
             ret += '\nTask Class' + TaskClass.str_long(self.get_class())