Changeset 16 for trunk/lib/nanownlib/storage.py

Timestamp:

08/01/15 19:01:31 (9 years ago)

Author:

tim

Message:

.

File:

• trunk/lib/nanownlib/storage.py (modified) (4 diffs)

trunk/lib/nanownlib/storage.py

@@ -7 +7 @@
 import threading
 import sqlite3
-
-import numpy
+try:
+    import numpy
+except:
+    sys.stderr.write('ERROR: Could not import numpy module.  Ensure it is installed.\n')
+    sys.stderr.write('       Under Debian, the package name is "python3-numpy"\n.')
+    sys.exit(1)
+
 # Don't trust numpy's seeding
 numpy.random.seed(random.SystemRandom().randint(0,2**32-1))
@@ -39 +44 @@
                                       tcpts_mean REAL,
                                       tcpts_stddev REAL,
-                                      tcpts_slopes TEXT)
+                                      tcpts_slopes TEXT,
+                                      unusual_case TEXT,
+                                      greater INTEGER)
                 """)
 
@@ -196 +203 @@
     def addPackets(self, pkts, window_size):
         query = ("INSERT INTO packets (id,probe_id,sent,observed,tsval,payload_len,tcpseq,tcpack)"
-                 " VALUES(randomblob(16),"
+                 " VALUES(hex(randomblob(16)),"
                  "(SELECT id FROM probes WHERE local_port=:local_port AND :observed>time_of_day"
                  " AND :observed<time_of_day+userspace_rtt+%d" 
@@ -254 +261 @@
         self.conn.execute(query, params)
         self.conn.commit()
-        
+    
+    def setUnusualCase(self, unusual_case, greater):
+        query = """SELECT * FROM meta LIMIT 1"""
+        cursor = self.conn.cursor()
+        cursor.execute(query)
+        row = cursor.fetchone()
+        if row == None:
+            params = {"id":_newid()}
+        else:
+            params = dict(row)
+
+        params["unusual_case"]=unusual_case
+        params["greater"]=greater
+        
+        keys = params.keys()
+        columns = ','.join(keys)
+        placeholders = ':'+', :'.join(keys)
+        
+        query = """INSERT OR REPLACE INTO meta (%s) VALUES (%s)""" % (columns, placeholders)
+        cursor.execute(query, params)
+        
+        
+    def getUnusualCase(self):
+        query = """SELECT unusual_case,greater FROM meta LIMIT 1"""
+        cursor = self.conn.cursor()
+        cursor.execute(query)
+        row = cursor.fetchone()
+        if row == None or row[0] == None or row[1] == None:
+            return None
+        else:
+            return tuple(row)