Merge zizzer.eecs.umich.edu:/bk/m5/

into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : c8b7f46e9d0dbff2a12a7375d361098fba352647

1 files changed, 32 insertions, 5 deletions

diff --git a/util/stats/db.py b/util/stats/db.py
index 4cba82446..ed5d10bc2 100644
--- a/util/stats/db.py
+++ b/util/stats/db.py
@@ -171,7 +171,7 @@ class Database(object):
 
         self.query('select * from formulas')
         for id,formula in self.cursor.fetchall():
-            self.allFormulas[int(id)] = formula
+            self.allFormulas[int(id)] = formula.tostring()
 
         StatData.db = self
         self.query('select * from stats')
@@ -207,16 +207,43 @@ class Database(object):
 
     # Name: listTicks
     # Desc: Prints all samples for a given run
-    def listTicks(self, run=None):
+    def listTicks(self, runs=None):
         print "tick"
         print "----------------------------------------"
-        sql = 'select distinct dt_tick from data where dt_stat=1950'
-        #if run != None:
-        #    sql += ' where dt_run=%d' % run
+        sql = 'select distinct dt_tick from data where dt_stat=1180 and ('
+        if runs != None:
+            first = True
+            for run in runs:
+               if first:
+            #       sql += ' where'
+                   first = False
+               else:
+                   sql += ' or'
+               sql += ' dt_run=%s' % run.run
+            sql += ')'
         self.query(sql)
         for r in self.cursor.fetchall():
             print r[0]
 
+    # Name: retTicks
+    # Desc: Prints all samples for a given run
+    def retTicks(self, runs=None):
+        sql = 'select distinct dt_tick from data where dt_stat=1180 and ('
+        if runs != None:
+            first = True
+            for run in runs:
+               if first:
+                   first = False
+               else:
+                   sql += ' or'
+               sql += ' dt_run=%s' % run.run
+            sql += ')'
+        self.query(sql)
+        ret = []
+        for r in self.cursor.fetchall():
+            ret.append(r[0])
+        return ret
+
     # Name: liststats
     # Desc: Prints all statistics that appear in the database,
     #         the optional argument is a regular expression that can