Peter Surda
fd1a6c1fa1
- dandelion fixes - try to wait as long as possible before expiration if there are no outbound connections - expire in invThread rather than singleCleaner thread - deduplication of code in inv and dinv command methods - turn on by default, seems to work correctly now - turn off dandelion if outbound connections are disabled - start tracking downloads earlier, and faster download loop - remove some obsolete lines - minor PEP8 updates
75 lines
2.7 KiB
Python
75 lines
2.7 KiB
Python
import random
|
|
import threading
|
|
import time
|
|
|
|
import addresses
|
|
from dandelion import Dandelion
|
|
from debug import logger
|
|
from helper_threading import StoppableThread
|
|
from inventory import Inventory
|
|
from network.connectionpool import BMConnectionPool
|
|
import protocol
|
|
from state import missingObjects
|
|
|
|
class DownloadThread(threading.Thread, StoppableThread):
|
|
minPending = 200
|
|
maxRequestChunk = 1000
|
|
requestTimeout = 60
|
|
cleanInterval = 60
|
|
requestExpires = 3600
|
|
|
|
def __init__(self):
|
|
threading.Thread.__init__(self, name="Downloader")
|
|
self.initStop()
|
|
self.name = "Downloader"
|
|
logger.info("init download thread")
|
|
self.lastCleaned = time.time()
|
|
|
|
def cleanPending(self):
|
|
deadline = time.time() - DownloadThread.requestExpires
|
|
try:
|
|
toDelete = [k for k, v in missingObjects.iteritems() if v < deadline]
|
|
except RuntimeError:
|
|
pass
|
|
else:
|
|
for i in toDelete:
|
|
del missingObjects[i]
|
|
self.lastCleaned = time.time()
|
|
|
|
def run(self):
|
|
while not self._stopped:
|
|
requested = 0
|
|
# Choose downloading peers randomly
|
|
connections = [x for x in BMConnectionPool().inboundConnections.values() + BMConnectionPool().outboundConnections.values() if x.fullyEstablished]
|
|
random.shuffle(connections)
|
|
try:
|
|
requestChunk = max(int(min(DownloadThread.maxRequestChunk, len(missingObjects)) / len(connections)), 1)
|
|
except ZeroDivisionError:
|
|
requestChunk = 1
|
|
for i in connections:
|
|
now = time.time()
|
|
try:
|
|
request = i.objectsNewToMe.randomKeys(requestChunk)
|
|
except KeyError:
|
|
continue
|
|
payload = bytearray()
|
|
payload.extend(addresses.encodeVarint(len(request)))
|
|
for chunk in request:
|
|
if chunk in Inventory() and not Dandelion().hasHash(chunk):
|
|
try:
|
|
del i.objectsNewToMe[chunk]
|
|
except KeyError:
|
|
pass
|
|
continue
|
|
payload.extend(chunk)
|
|
missingObjects[chunk] = now
|
|
if not payload:
|
|
continue
|
|
i.append_write_buf(protocol.CreatePacket('getdata', payload))
|
|
logger.debug("%s:%i Requesting %i objects", i.destination.host, i.destination.port, len(request))
|
|
requested += len(request)
|
|
if time.time() >= self.lastCleaned + DownloadThread.cleanInterval:
|
|
self.cleanPending()
|
|
if not requested:
|
|
self.stop.wait(1)
|