Pending download stats optimisations

- tracks separately a global list for a faster sum. Needs slightly
more memory

src/network/bmproto.py

@@ -534,6 +534,10 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
                         del connection.objectsNewToThem[hashId]
                 except KeyError:
                     pass
+        try:
+            del state.missingObjects[hashId]
+        except KeyError:
+            pass
 
     def handle_close(self):
         self.set_state("close")

src/network/objectracker.py

@@ -5,6 +5,7 @@ from threading import RLock
 from debug import logger
 from inventory import Inventory
 from network.dandelion import Dandelion
+from state import missingObjects
 
 haveBloom = False
 
@@ -82,6 +83,7 @@ class ObjectTracker(object):
         except KeyError:
             pass
         if hashId not in Inventory():
+            missingObjects[hashId] = None
             with self.objectsNewToMeLock:
                 self.objectsNewToMe[hashId] = True
         elif hashId in Dandelion().hashMap:

src/network/stats.py

@@ -2,6 +2,7 @@ import time
 
 from network.connectionpool import BMConnectionPool
 import asyncore_pollchoose as asyncore
+from state import missingObjects
 
 lastReceivedTimestamp = time.time()
 lastReceivedBytes = 0
@@ -50,19 +51,20 @@ def downloadSpeed():
     return currentReceivedSpeed
 
 def pendingDownload():
-    tmp = {}
+    return len(missingObjects)
-    for connection in BMConnectionPool().inboundConnections.values() + \
+    #tmp = {}
-            BMConnectionPool().outboundConnections.values():
+    #for connection in BMConnectionPool().inboundConnections.values() + \
-        for k in connection.objectsNewToMe.keys():
+    #        BMConnectionPool().outboundConnections.values():
-            tmp[k] = True
+    #    for k in connection.objectsNewToMe.keys():
-    return len(tmp)
+    #        tmp[k] = True
+    #return len(tmp)
 
 def pendingUpload():
-    tmp = {}
+    #tmp = {}
-    for connection in BMConnectionPool().inboundConnections.values() + \
+    #for connection in BMConnectionPool().inboundConnections.values() + \
-            BMConnectionPool().outboundConnections.values():
+    #        BMConnectionPool().outboundConnections.values():
-        for k in connection.objectsNewToThem.keys():
+    #    for k in connection.objectsNewToThem.keys():
-            tmp[k] = True
+    #        tmp[k] = True
     #This probably isn't the correct logic so it's disabled
     #return len(tmp)
     return 0

src/state.py

@@ -43,6 +43,9 @@ trustedPeer = None
 
 discoveredPeers = {}
 
+# tracking pending downloads globally, for stats
+missingObjects = {}
+
 Peer = collections.namedtuple('Peer', ['host', 'port'])
 
 def resetNetworkProtocolAvailability():