oops, another buglet

[quix0rs-apt-p2p.git] / khashmir.py

diff --git a/khashmir.py b/khashmir.py
index 9c7b2ef68c7b05cc5e3cee1b11245922ce677990..36ff79f8abf02894802285f8c980af4464f8c373 100644 (file)
--- a/khashmir.py
+++ b/khashmir.py
@@ -49,12 +49,14 @@ class Khashmir(xmlrpc.XMLRPC):
     def loadDB(self, db):
        try:
            self.store = sqlite.connect(db=db)
+            self.store.autocommit = 1
        except:
            import traceback
            raise KhashmirDBExcept, "Couldn't open DB", traceback.exc_traceback
            
     def createNewDB(self, db):
        self.store = sqlite.connect(db=db)
+        self.store.autocommit = 1
        s = """
            create table kv (key text, value text, time timestamp, primary key (key, value));
            create index kv_key on kv(key);
@@ -64,7 +66,6 @@ class Khashmir(xmlrpc.XMLRPC):
            """
        c = self.store.cursor()
        c.execute(s)
-       self.store.commit()
                
     def render(self, request):
        """
@@ -199,15 +200,13 @@ class Khashmir(xmlrpc.XMLRPC):
        df.addCallbacks(_pongHandler,_defaultPong)
 
 
-    def findCloseNodes(self):
+    def findCloseNodes(self, callback=lambda a: None):
        """
            This does a findNode on the ID one away from our own.  
            This will allow us to populate our table with nodes on our network closest to our own.
            This is called as soon as we start up with an empty table
        """
        id = self.node.id[:-1] + chr((ord(self.node.id[-1]) + 1) % 256)
-       def callback(nodes):
-           pass
        self.findNode(id, callback)
 
     def refreshTable(self):
@@ -258,19 +257,15 @@ class Khashmir(xmlrpc.XMLRPC):
        return nodes, self.node.senderDict()
            
     def xmlrpc_store_value(self, key, value, sender):
-       t = `time.time()`
-       s = "insert into kv values ('%s', '%s', '%s')" % (key, value, t)
+       t = "%0.6f" % time.time()
+       s = "insert into kv values ('%s', '%s', '%s');" % (key, value, t)
        c = self.store.cursor()
        try:
            c.execute(s)
        except pysqlite_exceptions.IntegrityError, reason:
-           if reason == 'constraint failed':
-               # update last insert time
-               s = "update kv set time = '%s' where key = '%s' and value = %s" % (key, value)
-               c.execute(s)
-           else:
-               raise pysqlite_exceptions.IntegrityError, reason
-       self.store.commit()
+           # update last insert time
+           s = "update kv set time = '%s' where key = '%s' and value = '%s';" % (t, key, value)
+           c.execute(s)
        ip = self.crequest.getClientIP()
        sender['host'] = ip
        n = Node().initWithDict(sender)
@@ -300,6 +295,7 @@ class Khashmir(xmlrpc.XMLRPC):
 
 def test_build_net(quiet=0, peers=24, host='localhost',  pause=1):
     from whrandom import randrange
+    import threading
     import thread
     port = 2001
     l = []
@@ -316,7 +312,7 @@ def test_build_net(quiet=0, peers=24, host='localhost',  pause=1):
     time.sleep(1)
     for peer in l[1:]:
        peer.app.run()
-       #time.sleep(.25)
+    time.sleep(10)
 
     print "adding contacts...."
 
@@ -328,17 +324,18 @@ def test_build_net(quiet=0, peers=24, host='localhost',  pause=1):
        n = l[randrange(0, len(l))].node
        peer.addContact(host, n.port)
        if pause:
-           time.sleep(.5)
-           
-    time.sleep(1)
+           time.sleep(.33)
+       
+    time.sleep(10)
     print "finding close nodes...."
 
     for peer in l:
-       peer.findCloseNodes()
-       if pause:
-           time.sleep(.5)
-    if pause:
-           time.sleep(1)
+       flag = threading.Event()
+       def cb(nodes, f=flag):
+           f.set()
+       peer.findCloseNodes(cb)
+       flag.wait()
+
 #    for peer in l:
 #      peer.refreshTable()
     return l