Minor multiqueue updates

- add task_done to addrthread and invthread
- implement totalSize for multiqueue
- order in invThread changed

src/multiqueue.py

@@ -24,8 +24,7 @@ class MultiQueue(Queue.Queue):
     # Put a new item in the queue
     def _put(self, item):
         #self.queue.append(item)
-        i = random.randrange(0, self.queueCount) 
+        self.queues[random.randrange(self.queueCount)].append((item))
-        self.queues[i].append((item))
 
     # Get an item from the queue
     def _get(self):
@@ -33,3 +32,6 @@ class MultiQueue(Queue.Queue):
 
     def iterate(self):
         self.iter = (self.iter + 1) % self.queueCount
+
+    def totalSize(self):
+        return sum(len(x) for x in self.queues)

src/network/addrthread.py

@@ -31,4 +31,6 @@ class AddrThread(threading.Thread, StoppableThread):
             #finish
 
             addrQueue.iterate()
+            for i in range(len(chunk)):
+                addrQueue.task_done()
             self.stop.wait(1)

src/network/invthread.py

@@ -33,6 +33,7 @@ class InvThread(threading.Thread, StoppableThread):
                 self.dandelionLocalRouteRefresh()
                 try:
                     data = invQueue.get(False)
+                    chunk.append((data[0], data[1]))
                     # locally generated
                     if len(data) == 2:
                         DandelionStems().add(data[1], None, self.dandelionRoutes)
@@ -41,7 +42,6 @@ class InvThread(threading.Thread, StoppableThread):
                     else:
                         source = BMConnectionPool().getConnectionByAddr(data[2])
                         BMConnectionPool().handleReceivedObject(data[0], data[1], source)
-                    chunk.append((data[0], data[1]))
                 except Queue.Empty:
                     break
                 # connection not found, handle it as if generated locally
@@ -81,4 +81,6 @@ class InvThread(threading.Thread, StoppableThread):
                         connection.append_write_buf(protocol.CreatePacket('dinv', \
                                 addresses.encodeVarint(len(stems)) + "".join(stems)))
             invQueue.iterate()
+            for i in range(len(chunk)):
+                invQueue.task_done()
             self.stop.wait(1)