replace task.LoopingCall's with deferral.RobustLoopingCall that catches errors and...

[p2pool.git] / p2pool / util / expiring_dict.py

diff --git a/p2pool/util/expiring_dict.py b/p2pool/util/expiring_dict.py
index edae4b3..8a3c9ee 100644 (file)
--- a/p2pool/util/expiring_dict.py
+++ b/p2pool/util/expiring_dict.py
@@ -1,8 +1,9 @@
 from __future__ import division
 
 import time
+import weakref
 
-from twisted.internet import task
+from p2pool.util import deferral
 
 class Node(object):
     def __init__(self, contents, prev=None, next=None):
@@ -103,8 +104,10 @@ class ExpiringDict(object):
         
         self.expiry_deque = LinkedList()
         self.d = dict() # key -> node, value
-        self._expire_loop = task.LoopingCall(self.expire)
-        self._expire_loop.start(1) # XXX use inlinecallbacks and stop expiring at some point
+        
+        self_ref = weakref.ref(self, lambda _: expire_loop.stop() if expire_loop.running else None)
+        self._expire_loop = expire_loop = deferral.RobustLoopingCall(lambda: self_ref().expire())
+        expire_loop.start(1)
     
     def stop(self):
         self._expire_loop.stop()
@@ -175,23 +178,3 @@ class ExpiringDict(object):
     def itervalues(self):
         for node, value in self.d.itervalues():
             yield value
-
-if __name__ == '__main__':
-    x = ExpiringDict(5)
-    print x
-    
-    time.sleep(1)
-    
-    x[1] = 2
-    print 'x[1] = 2'
-    print x
-    
-    time.sleep(1)
-    
-    x[1] = 3
-    print 'x[1] = 3'
-    print x
-    
-    time.sleep(5)
-    
-    print x