# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@gmail.com>
# Date 1326828949 -3600
# Node ID 2bc254976621b3f28de3532be3612f12a9c6c9ce
# Parent  152f3b5146185cde5bfa44954ebca62ca2d12136
make SPECjvm2008 warmup time 120s, delete old benchmarkdb.py

diff -r 152f3b514618 -r 2bc254976621 mx/benchmarkdb.py
--- a/mx/benchmarkdb.py	Tue Jan 17 13:43:19 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-import sqlite3
-
-class BenchmarkDb:
-    def __init__(self, path):
-        self.con = sqlite3.connect(path)
-        c = self.con.cursor();
-        c.execute('pragma foreign_keys = on')
-        c.execute('create table if not exists results (revnum integer, foreign key(benchmarkid) references benchmarks(benchmarkid), foreign key(valueid) references benchmarkvalues(valueid), value real)')
-        c.execute('create table if not exists benchmarks (benchmarkid integer primary key autoincrement, name text)')
-        c.execute('create table if not exists benchmarkvalues (valueid integer primary key autoincrement, name text)')
-        self.con.commit()
-        c.close()
-
-    def insertResults(self, revision, results):
-        c = self.con.cursor()
-        for result in results:
-            if not result.has_key('benchmark'):
-                continue
-            benchmarkName = result['benchmark']
-            del result['benchmark']
-            if len(result.keys()) <= 0:
-                continue
-            
-            benchIdRow = c.execute('select benchmarkid from benchmarks where name="' + benchmarkName + '"').fetchone()
-            benchId = -1;
-            if benchIdRow is None:
-                c.execute('insert into benchmarks (name) values ("' + benchmarkName + '")  values ')
-                benchId = c.lastrowid()
-            else:
-                benchId = benchIdRow['benchmarkid']
-            
-            insertcmd = 'insert into results (revnum, benchmarkid, valueid, value) '
-            first = True
-            for valueName in result.keys():
-                valueIdRow = c.execute('select valueid from benchmarkvalues where name="' + valueName + '"').fetchone()
-                valueId = -1;
-                if valueIdRow is None:
-                    c.execute('insert into benchmarkvalues (name) values ("' + valueName + '")')
-                    valueId = c.lastrowid()
-                else:
-                    valueId = benchIdRow['valueid']
-                
-                if first:
-                    insertcmd = insertcmd + 'select ' + str(revision) + ' as revnum, ' + str(benchId) + ' as benchmarkid, ' + str(valueId) + ' as valueid, ' + result[valueName] + ' as value '
-                else:
-                    insertcmd = insertcmd + 'union select ' + str(revision) + ', ' + str(benchId) + ', ' + str(valueId) + ', ' + result[valueName] + ' '
-            c.execute(insertcmd)
-        self.con.commit()
-        c.close()
-        
-    def close(self):
-        self.con.close()
\ No newline at end of file
diff -r 152f3b514618 -r 2bc254976621 mx/commands.py
--- a/mx/commands.py	Tue Jan 17 13:43:19 2012 +0100
+++ b/mx/commands.py	Tue Jan 17 20:35:49 2012 +0100
@@ -542,7 +542,7 @@
         benchmarks += sanitycheck.getBootstraps()
     #SPECjvm2008
     if ('specjvm2008' in args or 'all' in args):
-        benchmarks += [sanitycheck.getSPECjvm2008(True, 60, 120)]
+        benchmarks += [sanitycheck.getSPECjvm2008(True, 120, 120)]
     
     for test in benchmarks:
         if not results.has_key(test.group):