Modify khashmir's config system to not use the const module.

[quix0rs-apt-p2p.git] / apt_dht_Khashmir / actions.py

diff --git a/apt_dht_Khashmir/actions.py b/apt_dht_Khashmir/actions.py
index 013a9a7544dcd79189efb010a0afe3cab9c430d8..dc743de2e7658bcb2e598bc3ccb503964b702c6c 100644 (file)
--- a/apt_dht_Khashmir/actions.py
+++ b/apt_dht_Khashmir/actions.py
@@ -5,14 +5,14 @@ from time import time
 
 from twisted.internet import reactor
 
-import const
 from khash import intify
 
 class ActionBase:
     """ base class for some long running asynchronous proccesses like finding nodes or values """
-    def __init__(self, table, target, callback):
+    def __init__(self, table, target, callback, config):
         self.table = table
         self.target = target
+        self.config = config
         self.num = intify(target)
         self.found = {}
         self.queried = {}
@@ -70,7 +70,7 @@ class FindNode(ActionBase):
             return
         l = self.found.values()
         l.sort(self.sort)
-        for node in l[:const.K]:
+        for node in l[:self.config['K']]:
             if node.id == self.target:
                 self.finished=1
                 return self.callback([node])
@@ -80,13 +80,13 @@ class FindNode(ActionBase):
                 df.addCallbacks(self.handleGotNodes, self.makeMsgFailed(node))
                 self.outstanding = self.outstanding + 1
                 self.queried[node.id] = 1
-            if self.outstanding >= const.CONCURRENT_REQS:
+            if self.outstanding >= self.config['CONCURRENT_REQS']:
                 break
         assert(self.outstanding) >=0
         if self.outstanding == 0:
             ## all done!!
             self.finished=1
-            reactor.callLater(0, self.callback, l[:const.K])
+            reactor.callLater(0, self.callback, l[:self.config['K']])
     
     def makeMsgFailed(self, node):
         def defaultGotNodes(err, self=self, node=node):
@@ -112,8 +112,8 @@ class FindNode(ActionBase):
 
 get_value_timeout = 15
 class GetValue(FindNode):
-    def __init__(self, table, target, callback, find="findValue"):
-        FindNode.__init__(self, table, target, callback)
+    def __init__(self, table, target, callback, config, find="findValue"):
+        FindNode.__init__(self, table, target, callback, config)
         self.findValue = find
             
     """ get value task """
@@ -159,7 +159,7 @@ class GetValue(FindNode):
         l = self.found.values()
         l.sort(self.sort)
         
-        for node in l[:const.K]:
+        for node in l[:self.config['K']]:
             if (not self.queried.has_key(node.id)) and node.id != self.table.node.id:
                 #xxx t.timeout = time.time() + GET_VALUE_TIMEOUT
                 try:
@@ -172,7 +172,7 @@ class GetValue(FindNode):
                     df.addErrback(self.makeMsgFailed(node))
                     self.outstanding = self.outstanding + 1
                     self.queried[node.id] = 1
-            if self.outstanding >= const.CONCURRENT_REQS:
+            if self.outstanding >= self.config['CONCURRENT_REQS']:
                 break
         assert(self.outstanding) >=0
         if self.outstanding == 0:
@@ -196,8 +196,8 @@ class GetValue(FindNode):
 
 
 class StoreValue(ActionBase):
-    def __init__(self, table, target, value, callback, store="storeValue"):
-        ActionBase.__init__(self, table, target, callback)
+    def __init__(self, table, target, value, callback, config, store="storeValue"):
+        ActionBase.__init__(self, table, target, callback, config)
         self.value = value
         self.stored = []
         self.store = store
@@ -208,11 +208,11 @@ class StoreValue(ActionBase):
         if self.finished:
             return
         self.stored.append(t)
-        if len(self.stored) >= const.STORE_REDUNDANCY:
+        if len(self.stored) >= self.config['STORE_REDUNDANCY']:
             self.finished=1
             self.callback(self.stored)
         else:
-            if not len(self.stored) + self.outstanding >= const.STORE_REDUNDANCY:
+            if not len(self.stored) + self.outstanding >= self.config['STORE_REDUNDANCY']:
                 self.schedule()
         return t
     
@@ -228,9 +228,9 @@ class StoreValue(ActionBase):
     def schedule(self):
         if self.finished:
             return
-        num = const.CONCURRENT_REQS - self.outstanding
-        if num > const.STORE_REDUNDANCY:
-            num = const.STORE_REDUNDANCY
+        num = self.config['CONCURRENT_REQS'] - self.outstanding
+        if num > self.config['STORE_REDUNDANCY']:
+            num = self.config['STORE_REDUNDANCY']
         for i in range(num):
             try:
                 node = self.nodes.pop()
@@ -257,16 +257,17 @@ class StoreValue(ActionBase):
 
 
 class KeyExpirer:
-    def __init__(self, store):
+    def __init__(self, store, config):
         self.store = store
-        reactor.callLater(const.KEINITIAL_DELAY, self.doExpire)
+        self.config = config
+        reactor.callLater(self.config['KEINITIAL_DELAY'], self.doExpire)
     
     def doExpire(self):
-        self.cut = "%0.6f" % (time() - const.KE_AGE)
+        self.cut = "%0.6f" % (time() - self.config['KE_AGE'])
         self._expire()
     
     def _expire(self):
         c = self.store.cursor()
         s = "delete from kv where time < '%s';" % self.cut
         c.execute(s)
-        reactor.callLater(const.KE_DELAY, self.doExpire)
+        reactor.callLater(self.config['KE_DELAY'], self.doExpire)