Major update completed. Everything merged back into one file. Created

run.py as "launchpad" (see README).

2 files changed, 198 insertions, 19 deletions

diff --git a/run.py b/run.py
index c1eac09..b1710fe 100755
--- a/run.py
+++ b/run.py
@@ -1,12 +1,71 @@
 #!/usr/bin/python3
-
 import sta
-import list
-trace = sta.Trace(list.list)
-#trace.filter("exec_time>8828")
-#trace.filter("job==12")
-#trace.filter("when>2000000000")
-#trace.filter("when<2500000000")
-trace.filter("forced?==True")
-for record in trace.iter:
-    sta.print_record_verbose(record)
+
+######################################
+# Sched Trace Analyzer LaunchPad     #
+######################################
+
+def main():
+
+    #trace = sta.Trace(short_list)
+    trace = sta.Trace(g6_list)
+
+    #trace.filter("exec_time>8828")
+    #trace.filter("job==12")
+    #trace.filter("when>2000000000")
+    #trace.filter("when<2500000000")
+    #trace.filter("forced?==True")
+
+    #trace.filter("type==1")
+    #trace.sort(lambda x: x['pid'] or 0)
+
+    for record in trace.iter:
+        sta.print_record_verbose(record)
+
+
+
+
+
+######################################
+# Put lists of your trace files here #
+######################################
+
+
+full_list = [
+'/home/mollison/sta-alt/traces/st-g6-0.bin',
+'/home/mollison/sta-alt/traces/st-g6-1.bin',
+'/home/mollison/sta-alt/traces/st-g6-2.bin',
+'/home/mollison/sta-alt/traces/st-g6-3.bin',
+'/home/mollison/sta-alt/traces/st-x19-0.bin',
+'/home/mollison/sta-alt/traces/st-x19-1.bin',
+'/home/mollison/sta-alt/traces/st-x19-2.bin',
+'/home/mollison/sta-alt/traces/st-x19-3.bin',
+'/home/mollison/sta-alt/traces/st0.fg',
+'/home/mollison/sta-alt/traces/st1.fg']
+
+short_list = [
+'/home/mollison/sta-alt/traces/st-x19-2.bin']
+
+g6_list = [
+'/home/mollison/sta-alt/traces/st-g6-0.bin',
+'/home/mollison/sta-alt/traces/st-g6-1.bin',
+'/home/mollison/sta-alt/traces/st-g6-2.bin',
+'/home/mollison/sta-alt/traces/st-g6-3.bin']
+
+x19_list = [
+'/home/mollison/sta-alt/traces/st-x19-0.bin',
+'/home/mollison/sta-alt/traces/st-x19-1.bin',
+'/home/mollison/sta-alt/traces/st-x19-2.bin',
+'/home/mollison/sta-alt/traces/st-x19-3.bin']
+
+simple_list = [
+'/home/mollison/sta-alt/traces/st0.fg',
+'/home/mollison/sta-alt/traces/st1.fg']
+
+
+##############
+# start main #
+##############
+
+if __name__=='__main__':
+    main()
diff --git a/sta.py b/sta.py
index 0354495..49cbd5d 100755
--- a/sta.py
+++ b/sta.py
@@ -6,12 +6,10 @@
 ##################
 
 import sys
-from sta_output import *
-from sta_types import *
-
+import struct
 
 ##################
-# Business logic #
+# Trace class    #
 ##################
 class Trace:
     """Object representing a trace (i.e. set of records)"""
@@ -25,17 +23,24 @@ class Trace:
         for file in files:
             f = open(file,'rb')
             while True:
+                data = f.read(24)
+                try:
+                    typenum = struct.unpack_from('b',data)[0]
+                except struct.error: 
+                    #We read to the end of the file
+                    f.close()
+                    break
+                type = get_type(typenum)
                 try:
-                    data = f.read(st_record_size)
-                    typenum = struct.unpack_from('<b',data)[0]
-                    type = get_type(typenum)
                     values = struct.unpack_from(StHeader.format + 
                         type.format,data)
                     record = dict(zip(type.keys,values))
-                    yield record
                 except struct.error:
                     f.close()
-                    break
+                    print("Invalid record detected, stopping.")
+                    exit()
+                yield record
+
     def filter(self, criteria):
         """Apply a filter to the trace"""
 
@@ -61,3 +66,118 @@ class Trace:
             except KeyError:
                 return False
         self.iter = filter(func, self.iter)
+
+    def count(self):
+        """Return the number of records in the trace"""
+        return len(list(self.iter))
+
+    def sort(self, func):
+        """Return the records sorted by some key""" 
+        self.iter = sorted(self.iter, key=func)
+
+
+####################################
+# Types for binary data conversion #
+####################################
+
+import struct
+
+class StHeader:
+    format =  '<bbhi'
+    formatStr = struct.Struct(format)
+    keys = ['type','cpu','pid','job']
+    message = 'The header.'
+
+
+class StNameData:
+    format =  '16s'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['name']
+    message = 'The name of the executable of this process.'
+
+# Untested because this never appears in my sample files
+# ACTUALLY: None in 0, none in 1, a bunch in 2, and none in 3
+class StParamData:  
+    format =  'IIIc'
+    #format =  'ccccc'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['wcet','period','phase','partition']
+    message = 'Regular parameters.'
+
+
+class StReleaseData:
+    format =  'LL'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['release_time','deadline']
+    message = 'A job was/is going to be released.'
+
+ 
+class StAssignedData:
+    format =  'Lc'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['when','target']
+    message = 'A job was assigned to a CPU.'
+
+class StSwitchToData:
+    format =  'LI'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['when','exec_time']
+    message = 'A process was switched to on a given CPU.'
+
+
+class StSwitchAwayData:
+    format =  'LI'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['when','exec_time']
+    message = 'A process was away on a given CPU.'
+
+class StCompletionData:
+    format =  'L7x?c'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['when','forced?','flags']
+    message = 'A job completed.'
+
+
+class StBlockData:
+    format =  'L'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['when']
+    message = 'A task blocks.'
+
+
+class StResumeData:
+    format =  'L'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['when']
+    message = 'A task resumes.'
+
+
+class StSysReleaseData:
+    format =  'LL'
+    formatStr = struct.Struct(StHeader.format + format)
+    keys = StHeader.keys + ['when','release']
+    message = 'StSysReleaseData (no details).'
+
+def get_type(type_num):
+    """Return the binary data type, given the type_num"""
+    types = [None,StNameData,StParamData,StReleaseData,StAssignedData,
+             StSwitchToData,StSwitchAwayData,StCompletionData,StBlockData,
+             StResumeData,StSysReleaseData]
+    return types[type_num]
+
+
+####################################
+#    Output formatting functions   #
+####################################
+
+def print_record_verbose(record):
+    """Prints a record verbosely, given the record as a dict."""
+    print(50*'=')
+    print(get_type(record['type']).message)
+    for k,v in record.items():
+        print(k +":", v)
+
+def print_record_type(record):
+    """Prints the type of a record."""
+    print(record['type'])
+