Added more complicated filter mechanism, added run.py which demonstrates the current abilities of STA, and added list.py, which is used by run.py. Updated DEV_NOTES.

4 files changed, 60 insertions, 6 deletions

diff --git a/DEV_NOTES b/DEV_NOTES
index bb80106..41f77a4 100644
--- a/DEV_NOTES
+++ b/DEV_NOTES
@@ -4,13 +4,15 @@ File Summary:
 -sta.py        : business logic
 -sta_types.py  : specifies binary format of sched trace data
 -sta_output.py : output formatting function(s)
+-run.py        : gives an example of how to use sta.py
+-list.py       : list of trace files. (you would have to change this file to be
+                 point to trace files on the local machine.)
 
+To test:
+1) Modify list.py to point to trace files on your local machine
+2) execute run.py  (e.g. run.py > out)
 
 Likely next steps:
 - Try to get StParamData working
-- Define convenience comparisons for ordering by earliest time for sort,
-- and lambdas for filtering by job or PID or CPU or whatever
-- and change read_trace to possibly take multiple traces.
-- and /maybe/ allow for saving /loading previously saved traces.
 
 
diff --git a/list.py b/list.py
new file mode 100644
index 0000000..194a0cb
--- /dev/null
+++ b/list.py
@@ -0,0 +1,14 @@
+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']
+
+list = [
+'/home/mollison/sta-alt/traces/st0.fg']
diff --git a/run.py b/run.py
new file mode 100755
index 0000000..c1eac09
--- /dev/null
+++ b/run.py
@@ -0,0 +1,12 @@
+#!/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)
diff --git a/sta.py b/sta.py
index 9706704..0354495 100755
--- a/sta.py
+++ b/sta.py
@@ -14,9 +14,14 @@ from sta_types import *
 # Business logic #
 ##################
 class Trace:
+    """Object representing a trace (i.e. set of records)"""
+
     def __init__(self,files):
+        """Initialize the Trace object with an iterator"""
         self.iter = self.make_iter(files) 
+
     def make_iter(self, files):
+        """Make the iterator for this Trace object"""
         for file in files:
             f = open(file,'rb')
             while True:
@@ -32,6 +37,27 @@ class Trace:
                     f.close()
                     break
     def filter(self, criteria):
-        func = eval("lambda x: " + criteria)
-        self.iter = filter(func, self.iter)
+        """Apply a filter to the trace"""
 
+        #Determine if they want to filter by >, <, or ==
+        comp = None
+        seps = ['>','<','==']
+        for sep in seps:
+            if criteria.find(sep) > 0: 
+                comp = sep
+        if not comp:
+            print("Your filter is invalid: " + criteria)
+            exit()
+
+        #Apply the filter
+        field, comp, value = criteria.partition(comp)
+        test = "rec['" + field + "']" + comp + "int(" + value + ")"
+        def func(rec):
+            try:
+                if eval(test):
+                    return True
+                else:
+                    return False
+            except KeyError:
+                return False
+        self.iter = filter(func, self.iter)