Peter Surda
ba4162d7fe
- get rid of per-connection writeQueue/receiveQueue, and instead use strings and locking - minor code cleanup - all state handlers now should set expectBytes - almost all data processing happens in ReceiveDataThread, and AsyncoreThread is almost only I/O (plus TLS). AsyncoreThread simply puts the connection object into the queue when it has some data for processing - allow poll, epoll and kqueue handlers. kqueue is untested and unoptimised, poll and epoll seem to work ok (linux) - stack depth threshold handler in decode_payload_content, this is recursive and I think was causing occasional RuntimeErrors. Fixes #964 - longer asyncore loops, as now data is handled in ReceiveDataThread - randomise node order when deciding what to download. Should prevent retries being stuck to the same node - socks cleanup (socks5 works ok, socks4a untested but should work too)
45 lines
1.4 KiB
Python
45 lines
1.4 KiB
Python
import Queue
|
|
import sys
|
|
import threading
|
|
import time
|
|
|
|
import addresses
|
|
from bmconfigparser import BMConfigParser
|
|
from debug import logger
|
|
from helper_threading import StoppableThread
|
|
from inventory import Inventory
|
|
from network.connectionpool import BMConnectionPool
|
|
from network.bmproto import BMProto
|
|
from queues import receiveDataQueue
|
|
import protocol
|
|
import state
|
|
|
|
class ReceiveQueueThread(threading.Thread, StoppableThread):
|
|
def __init__(self):
|
|
threading.Thread.__init__(self, name="ReceiveQueueThread")
|
|
self.initStop()
|
|
self.name = "ReceiveQueueThread"
|
|
logger.info("init receive queue thread")
|
|
|
|
def run(self):
|
|
while not self._stopped and state.shutdown == 0:
|
|
try:
|
|
connection = receiveDataQueue.get(block=True, timeout=1)
|
|
receiveDataQueue.task_done()
|
|
except Queue.Empty:
|
|
continue
|
|
|
|
if self._stopped:
|
|
break
|
|
# cycle as long as there is data
|
|
# methods should return False if there isn't enough data, or the connection is to be aborted
|
|
try:
|
|
while connection.process():
|
|
pass
|
|
except AttributeError:
|
|
# missing command
|
|
logger.error("Unknown state %s, ignoring", connection.state)
|
|
|
|
def stopThread(self):
|
|
super(ReceiveQueueThread, self).stopThread()
|