Less data transferred in invThread and addrThread

master
Peter Šurda 6 years ago
parent 2df9598774
commit 4fce01e34a
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87

@ -21,8 +21,12 @@ class AddrThread(threading.Thread, StoppableThread):
try:
data = addrQueue.get(False)
chunk.append((data[0], data[1]))
if len(data) > 2:
source = BMConnectionPool().getConnectionByAddr(data[2])
except Queue.Empty:
break
except KeyError:
continue
#finish

@ -290,7 +290,7 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
Inventory()[self.object.inventoryHash] = (
self.object.objectType, self.object.streamNumber, self.payload[objectOffset:], self.object.expiresTime, self.object.tag)
invQueue.put((self.object.streamNumber, self.object.inventoryHash, self))
invQueue.put((self.object.streamNumber, self.object.inventoryHash, self.destination))
return True
def _decode_addr(self):
@ -317,7 +317,7 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
"rating": 0,
"self": False,
}
addrQueue.put((stream, peer, self))
addrQueue.put((stream, peer, self.destination))
return True
def bm_command_portcheck(self):

@ -54,6 +54,17 @@ class BMConnectionPool(object):
def connectToStream(self, streamNumber):
self.streams.append(streamNumber)
def getConnectionByAddr(self, addr):
if addr in self.inboundConnections:
return self.inboundConnections[addr]
if addr.host in self.inboundConnections:
return self.inboundConnections[addr.host]
if addr in self.outboundConnections:
return self.outboundConnections[addr]
if addr in self.udpSockets:
return self.udpSockets[addr]
raise KeyError
def addConnection(self, connection):
if isinstance(connection, network.udp.UDPSocket):
return

@ -23,10 +23,14 @@ class InvThread(threading.Thread, StoppableThread):
if len(data) == 2:
BMConnectionPool().handleReceivedObject(data[0], data[1])
else:
BMConnectionPool().handleReceivedObject(data[0], data[1], data[2])
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
except KeyError:
BMConnectionPool().handleReceivedObject(data[0], data[1])
if chunk:
for connection in BMConnectionPool().inboundConnections.values() + \

@ -39,21 +39,8 @@ class ReceiveQueueThread(threading.Thread, StoppableThread):
# or the connection is to be aborted
try:
BMConnectionPool().inboundConnections[dest].process()
except KeyError:
try:
BMConnectionPool().inboundConnections[dest.host].process()
except KeyError:
pass
except AttributeError:
pass
try:
BMConnectionPool().outboundConnections[dest].process()
except (KeyError, AttributeError):
pass
try:
BMConnectionPool().udpSockets[dest].process()
BMConnectionPool().getConnectionByAddr(dest).process()
# KeyError = connection object not found
# AttributeError = state isn't implemented
except (KeyError, AttributeError):
pass

Loading…
Cancel
Save