Bitmessage/PyBitmessage-2024-12-01
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Download fixes

Browse Source 
- don't make empty requests
- don't make requests if all objects are pending already
This commit is contained in:
Peter Šurda 2018-02-02 12:44:43 +01:00
parent 57c8c7c07c
commit 053f434e04
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/downloadthread.py
View File

@ -62,6 +62,8 @@ class DownloadThread(threading.Thread, StoppableThread):
continue continue
payload.extend(chunk) payload.extend(chunk)
missingObjects[chunk] = now missingObjects[chunk] = now
if not payload:
continue
i.append_write_buf(protocol.CreatePacket('getdata', payload)) i.append_write_buf(protocol.CreatePacket('getdata', payload))
logger.debug("%s:%i Requesting %i objects", i.destination.host, i.destination.port, len(request)) logger.debug("%s:%i Requesting %i objects", i.destination.host, i.destination.port, len(request))
requested += len(request) requested += len(request)

5
src/randomtrackingdict.py
View File

@ -71,8 +71,9 @@ class RandomTrackingDict(object):
self.pendingTimeout = pendingTimeout self.pendingTimeout = pendingTimeout
def randomKeys(self, count=1): def randomKeys(self, count=1):
if self.len == 0 or (self.pendingLen >= self.maxPending and if self.len == 0 or ((self.pendingLen >= self.maxPending or
self.lastPoll + self.pendingTimeout > time()): self.pendingLen == self.len) and self.lastPoll +
self.pendingTimeout > time()):
raise KeyError raise KeyError
# reset if we've requested all # reset if we've requested all
with self.lock: with self.lock: