This commit of unit-trace converts it to Python2 from Python3, so that it

can operate with the visualizer, which uses Python2.

1 files changed, 38 insertions, 37 deletions

diff --git a/trace_reader.py b/trace_reader.py
index e18547e..a4ff964 100644
--- a/trace_reader.py
+++ b/trace_reader.py
@@ -49,7 +49,7 @@ def trace_reader(files):
     for file in files:
         file_iter = _get_file_iter(file)
         file_iters.append(file_iter)
-        file_iter_buff.append([next(file_iter)])
+        file_iter_buff.append([file_iter.next()])
 
     # We keep 100 records in each buffer and then keep the buffer sorted
     # This is because records may have been recorded slightly out of order
@@ -57,7 +57,7 @@ def trace_reader(files):
     # overwhelmingly probably.
     for x in range(0,len(file_iter_buff)):
         for y in range(0,100):
-            file_iter_buff[x].append(next(file_iters[x])) 
+            file_iter_buff[x].append(file_iters[x].next()) 
     for x in range(0,len(file_iter_buff)):
         file_iter_buff[x] = sorted(file_iter_buff[x],key=lambda rec: rec.when)
 
@@ -83,7 +83,7 @@ def trace_reader(files):
         # Try to append a new record to the buffer (if there is another) and
         #     then keep the buffer sorted
         try:
-            file_iter_buff[buff_to_refill].append(next(file_iters[buff_to_refill]))
+            file_iter_buff[buff_to_refill].append(file_iters[buff_to_refill].next())
             file_iter_buff[buff_to_refill] = sorted(file_iter_buff[buff_to_refill],
                 key=lambda rec: rec.when)
 
@@ -109,42 +109,42 @@ def trace_reader(files):
 
 # Returns an iterator to pull records from a file
 def _get_file_iter(file):
-    with open(file,'rb') as f:
-        while True:
-            data = f.read(RECORD_HEAD_SIZE)
-            try:
-                type_num = struct.unpack_from('b',data)[0]
-            except struct.error: 
-                break #We read to the end of the file
-            type = _get_type(type_num)
-            try:
-                values = struct.unpack_from(StHeader.format + 
-                    type.format,data)
-                record_dict = dict(zip(type.keys,values))
-            except struct.error:
-                f.close()
-                print("Invalid record detected, stopping.")
-                exit()
-
-            # Convert the record_dict into an object
-            record = _dict2obj(record_dict)
-
-            # Give it a type name (easier to work with than type number)
-            record.type_name = _get_type_name(type_num)
-
-            # All records should have a 'record type' field.
-            # e.g. these are 'event's as opposed to 'error's
-            record.record_type = "event"
-
-            # If there is no timestamp, set the time to 0
-            if 'when' not in record.__dict__.keys():
-                record.when = 0
-
-            yield record
+    f = open(file,'rb')
+    while True:
+        data = f.read(RECORD_HEAD_SIZE)
+        try:
+            type_num = struct.unpack_from('b',data)[0]
+        except struct.error: 
+            break #We read to the end of the file
+        type = _get_type(type_num)
+        try:
+            values = struct.unpack_from(StHeader.format + 
+                type.format,data)
+            record_dict = dict(zip(type.keys,values))
+        except struct.error:
+            f.close()
+            print "Invalid record detected, stopping."
+            exit()
+
+        # Convert the record_dict into an object
+        record = _dict2obj(record_dict)
+
+        # Give it a type name (easier to work with than type number)
+        record.type_name = _get_type_name(type_num)
+
+        # All records should have a 'record type' field.
+        # e.g. these are 'event's as opposed to 'error's
+        record.record_type = "event"
+
+        # If there is no timestamp, set the time to 0
+        if 'when' not in record.__dict__.keys():
+            record.when = 0
+
+        yield record
 
 # Convert a dict into an object
 def _dict2obj(d):
-    class Obj: pass
+    class Obj(object): pass
     o = Obj()
     for key in d.keys():
         o.__dict__[key] = d[key]
@@ -206,7 +206,8 @@ class StSwitchAwayData:
     message = 'A process was switched away on a given CPU.'
 
 class StCompletionData:
-    format =  'Q3x?c'
+    #format =  'Q3x?c'
+    format = 'Q3xcc'
     formatStr = struct.Struct(StHeader.format + format)
     keys = StHeader.keys + ['when','forced?','flags']
     message = 'A job completed.'