Nicer database access, fixed glitches/exploits confusion that was causing locks on...

[goodfet] / client / GoodFETGlitch.py

diff --git a/client/GoodFETGlitch.py b/client/GoodFETGlitch.py
index a02e1f3..49db85c 100644 (file)
--- a/client/GoodFETGlitch.py
+++ b/client/GoodFETGlitch.py
@@ -60,10 +60,11 @@ class GoodFETGlitch(GoodFET):
     def glitchvoltages(self,time):
         """Returns list of voltages to train at."""
         c=self.db.cursor();
-        c.execute("""select
-                     (select min(vcc) from glitches where time=? and count=1),
-                     (select max(vcc) from glitches where time=? and count=0);""",
-                  [time, time]);
+        #c.execute("""select
+        #             (select min(vcc) from glitches where time=? and count=1),
+        #             (select max(vcc) from glitches where time=? and count=0);""",
+        #          [time, time]);
+        c.execute("select min,max from glitchrange where time=? and max-min>0;",[time]);
         rows=c.fetchall();
         for r in rows:
             min=r[0];
@@ -74,7 +75,24 @@ class GoodFETGlitch(GoodFET):
             return range(min,max,1);
         #If we get here, there are no points.  Return empty set.
         return [];
-    
+    def crunch(self):
+        """This builds tables for glitching voltage ranges from the training set."""
+        print "Precomputing glitching ranges.  This might take a long while.";
+        print "Times...";
+        sys.stdout.flush();
+        self.db.execute("drop table if exists glitchrange;");
+        self.db.execute("create table glitchrange(time integer primary key asc,max,min);");
+        self.db.execute("insert into glitchrange(time,max,min) select distinct time, 0, 0 from glitches;");
+        self.db.commit();
+        print "Maximums...";
+        sys.stdout.flush();
+        self.db.execute("update glitchrange set max=(select max(vcc) from glitches where glitches.time=glitchrange.time and count=0);");
+        self.db.commit();
+        print "Minimums...";
+        sys.stdout.flush();
+        self.db.execute("update glitchrange set min=(select min(vcc) from glitches where glitches.time=glitchrange.time and count>0);");
+        self.db.commit();
+        print "Ranges calculated.";
     def graphx11(self):
         try:
             import Gnuplot, Gnuplot.PlotItems, Gnuplot.funcutils
@@ -109,7 +127,7 @@ class GoodFETGlitch(GoodFET):
         g('set term png');
         g('set output "timevcc.png"');
         g(script_timevcc);
-    def explore(self,tstart=0,tstop=-1, trials=5):
+    def explore(self,tstart=0,tstop=-1, trials=1):
         """Exploration phase.  Uses thresholds to find exploitable points."""
         gnd=0;
         self.scansetup(1); #Lock the chip, place key in eeprom.
@@ -117,9 +135,22 @@ class GoodFETGlitch(GoodFET):
             tstop=self.client.glitchstarttime();
         times=range(tstart,tstop);
         random.shuffle(times);
-        for t in times:
-            voltages=self.glitchvoltages(t);
-            print "Exploring %04i points in t=%04i." % (len(voltages),t);
+        #self.crunch();
+        count=0.0;
+        total=1.0*len(times);
+        
+        c=self.db.cursor();
+        c.execute("select time,min,max from glitchrange where max-min>0;");
+        rows=c.fetchall();
+        c.close();
+        random.shuffle(rows);
+        for r in rows:
+            t=r[0];
+            min=r[1];
+            max=r[2];
+            voltages=range(min,max,1);
+            count=count+1.0;
+            print "%02.02f Exploring %04i points in t=%04i." % (count/total,len(voltages),t);
             sys.stdout.flush();
             for vcc in voltages:
                 self.scanat(1,trials,vcc,gnd,t);
@@ -186,10 +217,10 @@ class GoodFETGlitch(GoodFET):
         rows=c.fetchall();
         for a in rows:
             return True;
+        c.close();
         return False; 
     def scanat(self,lock,trials,vcc,gnd,time):
         client=self.client;
-        db=self.db;
         client.glitchRate(time);
         client.glitchVoltages(gnd, vcc);  #drop voltage target
         gcount=0;
@@ -214,7 +245,7 @@ class GoodFETGlitch(GoodFET):
                     scount+=1;
         #print "values (%i,%i,%i,%i,%i);" % (
         #    time,vcc,gnd,gcount,scount);
-        if(lock>0):
+        if(lock==0):
             self.db.execute("insert into glitches(time,vcc,gnd,trials,glitchcount,count,lock)"
                    "values (%i,%i,%i,%i,%i,%i,%i);" % (
                 time,vcc,gnd,trials,gcount,scount,lock));