Try to rewrite sending big invs not using sets
This commit is contained in:
parent
20ae076746
commit
fba7aa635a
|
@ -277,22 +277,19 @@ class ConnectionBase(threading.Thread):
|
||||||
if len(addr) != 0:
|
if len(addr) != 0:
|
||||||
self.send_queue.put(message.Addr(addr))
|
self.send_queue.put(message.Addr(addr))
|
||||||
|
|
||||||
with shared.objects_lock:
|
|
||||||
if len(shared.objects) > 0:
|
if len(shared.objects) > 0:
|
||||||
to_send = {
|
with shared.objects_lock:
|
||||||
|
to_send = [
|
||||||
vector for vector in shared.objects.keys()
|
vector for vector in shared.objects.keys()
|
||||||
if shared.objects[vector].expires_time > time.time()}
|
if shared.objects[vector].expires_time > time.time()]
|
||||||
while len(to_send) > 0:
|
random.shuffle(to_send)
|
||||||
if len(to_send) > 10000:
|
offset = 0
|
||||||
|
while offset < len(to_send):
|
||||||
# We limit size of inv messaged to 10000 entries
|
# We limit size of inv messaged to 10000 entries
|
||||||
# because they might time out
|
# because they might time out
|
||||||
# in very slow networks (I2P)
|
# in very slow networks (I2P)
|
||||||
pack = random.sample(tuple(to_send), 10000)
|
self.send_queue.put(message.Inv(to_send[offset:offset+10000]))
|
||||||
self.send_queue.put(message.Inv(pack))
|
offset += 10000
|
||||||
to_send.difference_update(pack)
|
|
||||||
else:
|
|
||||||
self.send_queue.put(message.Inv(to_send))
|
|
||||||
to_send.clear()
|
|
||||||
self.status = 'fully_established'
|
self.status = 'fully_established'
|
||||||
|
|
||||||
def _process_queue(self):
|
def _process_queue(self):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user