citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Download optimisations

Browse Source 
- don't make empty download requests
- use smaller chunks when they can be spread across multiple
connections
This commit is contained in:
Peter Šurda 2018-01-01 12:51:35 +01:00
parent 1864762a0a
commit 36cc5b9cf5
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/network/downloadthread.py
View File

@ -43,7 +43,7 @@ class DownloadThread(threading.Thread, StoppableThread):
connections = BMConnectionPool().inboundConnections.values() + BMConnectionPool().outboundConnections.values()
random.shuffle(connections)
try:
requestChunk = max(int(DownloadThread.maxRequestChunk / len(connections)), 1)
requestChunk = max(int(min(DownloadThread.maxRequestChunk, len(missingObjects)) / len(connections)), 1)
except ZeroDivisionError:
requestChunk = 1
for i in connections:
@ -63,15 +63,14 @@ class DownloadThread(threading.Thread, StoppableThread):
except KeyError:
continue
random.shuffle(request)
if len(request) > requestChunk - downloadPending:
request = request[:max(1, requestChunk - downloadPending)]
if not request:
continue
if len(request) > requestChunk - downloadPending:
request = request[:requestChunk - downloadPending]
# mark them as pending
for k in request:
i.objectsNewToMe[k] = False
missingObjects[k] = now
payload = bytearray()
payload.extend(addresses.encodeVarint(len(request)))
for chunk in request: