Very minor change

-Cleaned up some commentary in sta.py
-Added path variable to run.py

2 files changed, 24 insertions, 26 deletions

diff --git a/run.py b/run.py
index b1710fe..eac0ef9 100755
--- a/run.py
+++ b/run.py
@@ -16,7 +16,7 @@ def main():
     #trace.filter("when<2500000000")
     #trace.filter("forced?==True")
 
-    #trace.filter("type==1")
+    trace.filter("type==1")
     #trace.sort(lambda x: x['pid'] or 0)
 
     for record in trace.iter:
@@ -30,37 +30,38 @@ def main():
 # Put lists of your trace files here #
 ######################################
 
+path = '/home/mollison/sta/traces/'
 
 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']
+path + 'st-g6-0.bin',
+path + 'st-g6-1.bin',
+path + 'st-g6-2.bin',
+path + 'st-g6-3.bin',
+path + 'st-x19-0.bin',
+path + 'st-x19-1.bin',
+path + 'st-x19-2.bin',
+path + 'st-x19-3.bin',
+path + 'st0.fg',
+path + 'st1.fg']
 
 short_list = [
-'/home/mollison/sta-alt/traces/st-x19-2.bin']
+path + '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']
+path + 'st-g6-0.bin',
+path + 'st-g6-1.bin',
+path + 'st-g6-2.bin',
+path + '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']
+path + 'st-x19-0.bin',
+path + 'st-x19-1.bin',
+path + 'st-x19-2.bin',
+path + 'st-x19-3.bin']
 
 simple_list = [
-'/home/mollison/sta-alt/traces/st0.fg',
-'/home/mollison/sta-alt/traces/st1.fg']
+path + 'st0.fg',
+path + 'st1.fg']
 
 
 ##############
diff --git a/sta.py b/sta.py
index 49cbd5d..4ff6414 100755
--- a/sta.py
+++ b/sta.py
@@ -95,8 +95,6 @@ class StNameData:
     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'
@@ -104,14 +102,13 @@ class StParamData:
     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.'
 
- 
+#Not yet used by Sched Trace 
 class StAssignedData:
     format =  'Lc'
     formatStr = struct.Struct(StHeader.format + format)