Major update.

-Completed sort method
-Moved print functions into Trace object, resuling in much nicer
	interface
-Created ability to count records by type

2 files changed, 30 insertions, 32 deletions

diff --git a/run.py b/run.py
index eac0ef9..5577a32 100755
--- a/run.py
+++ b/run.py
@@ -7,23 +7,21 @@ import sta
 
 def main():
 
-    #trace = sta.Trace(short_list)
+    # A sample trace
     trace = sta.Trace(g6_list)
+    trace.filter("pid==4125")
+    trace.sort('job')
+    trace.print_count(True)
+    trace.print_records()
 
+    #Some other things you can do (old commands I've used)
     #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)
-
-
-
+    #trace.filter("type==1")
+    #trace.filter("type!=3")
 
 
 ######################################
diff --git a/sta.py b/sta.py
index 6ff6b51..a73de40 100755
--- a/sta.py
+++ b/sta.py
@@ -67,11 +67,6 @@ class Trace:
                 return False
         self.iter = filter(func, self.iter)
 
-    def count(self):
-        """Return the number of records in the trace"""
-        return len(list(self.iter))
-
-    #Needs to be tested/finished
     def sort(self, key):
         """Return the records sorted by some key""" 
         def sortfunc(record):
@@ -81,6 +76,27 @@ class Trace:
                 return 0
         self.iter = sorted(self.iter, key=sortfunc)
 
+    def print_records(self):
+        """Prints all records in the trace"""
+        for record in self.iter:
+            print(50*'=')
+            print(get_type(record['type']).message)
+            for k,v in record.items():
+                print(k +":", v)
+
+    def print_count(self,verbose=False):
+        """Prints the number of records in the trace."""
+        print("Total Count: " + str(len(self.iter)))
+        if verbose:
+            counts = {1:0,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0,10:0}
+            for record in self.iter:
+                type = record['type']
+                counts[type] += 1
+            for key in counts.keys():
+                print(get_type(key).__name__ + 
+                      ': ' + str(counts[key]))
+        print("")
+
 
 ####################################
 # Types for binary data conversion #
@@ -130,7 +146,7 @@ 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.'
+    message = 'A process was switched away on a given CPU.'
 
 class StCompletionData:
     format =  'L7x?c'
@@ -163,19 +179,3 @@ def get_type(type_num):
              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'])
-