Factored out code into 3 .py files, did some cleanup, removed main()

Works fine

3 files changed, 112 insertions, 165 deletions

diff --git a/sta.py b/sta.py
index d8c883a..f97154d 100755
--- a/sta.py
+++ b/sta.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python3
+
 #Note to self: I stopped while working on implementing an iterator so I could
 # do a filter() operation to get only events of a certain job so I could compare
 # to Bjoern's pdf
@@ -10,93 +12,16 @@
     # - and /maybe/ allow for saving /loading previously saved traces.
 
 
-#!/usr/bin/python3
-
-# Imports.
-import struct
-import sys
-
-
-####################################
-# Types for binary data conversion #
-####################################
-
-st_record_size = 192
-
-
-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 =  'III8?'
-    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 AssignedData:
-    format =  'Lh'
-    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']
-
-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.'
+##################
+# Starting stuff #
+##################
 
+# Imports
+import sys
+from sta_output import *
+from sta_types import *
 
-class StSysReleaseData:
-    format =  'LL'
-    formatStr = struct.Struct(StHeader.format + format)
-    keys = StHeader.keys + ['when','release']
-    message = 'StSysReleaseData (no details).'
 
 
 
@@ -104,46 +29,6 @@ class StSysReleaseData:
 # Business logic #
 ##################
 
-
-def get_type(type_num):
-    """Return the class needed to read a record, given its numerical type"""
-    type = None
-    if type_num == 1:
-        return StNameData
-    elif type_num == 2:
-        return StParamData
-    elif type_num == 3:
-        return StReleaseData
-    elif type_num == 4:
-        return StAssignedData
-    elif type_num == 5:
-        return StSwitchToData
-    elif type_num == 6:
-        return StSwitchAwayData
-    elif type_num == 7:
-        return StCompletionData
-    elif type_num == 8:
-        return StBlockData
-    elif type_num == 9:
-        return StResumeData
-    elif type_num == 10:
-        return StSysReleaseData
-    return type
-
-
-def print_record(record):
-    """Prints a record, given the record as a dict."""
-    print(record)
-
-
-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 trace_iter(*files):
     """Returns an iterator for iterating over trace(s) and producing records."""
     for file in files:
@@ -159,44 +44,3 @@ def trace_iter(*files):
             except struct.error:
                 f.close()
                 break
-
-
-def trace(*files):
-    obj = "hi"
-    iter = trace_iter(*files)
-    def filter():
-        print("Hi!")
-    obj.filter = filter
-    obj.iter = iter
-    return obj
-
-
-########
-# Main #
-########
-
-
-def main(args):
-    """Main function, called if the program is executed."""
-    if args[1] == '-v':
-        printfunc = print_record_verbose 
-        files = sys.argv[2:]
-    else:
-        printfunc = print_record
-        files = args[1:]
-    for file in files: 
-        data = open(file,'rb').read()
-        offset = 0
-        try:
-            while True:
-                record = get_record(data,offset)
-                printfunc(record)
-                offset += st_record_size
-                #input("Press Enter")
-        except struct.error:  # We've reached the EOF.
-            continue
-
-
-# Call main() if the program is executed directly.
-if __name__ == "__main__":
-    main(sys.argv)
diff --git a/sta_output.py b/sta_output.py
new file mode 100644
index 0000000..d2235b7
--- /dev/null
+++ b/sta_output.py
@@ -0,0 +1,15 @@
+####################################
+#    Output formatting functions   #
+####################################
+
+def print_record(record):
+    """Prints a record, given the record as a dict."""
+    print(record)
+
+
+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)
diff --git a/sta_types.py b/sta_types.py
new file mode 100644
index 0000000..d837559
--- /dev/null
+++ b/sta_types.py
@@ -0,0 +1,88 @@
+####################################
+# Types for binary data conversion #
+####################################
+
+import struct
+
+st_record_size = 192
+
+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 =  'III8?'
+    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 =  'Lh'
+    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']
+
+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]