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)
34 lines
1.2 KiB
Python
34 lines
1.2 KiB
Python
import threading
|
|
import time
|
|
|
|
from bmconfigparser import BMConfigParser
|
|
from debug import logger
|
|
from helper_threading import StoppableThread
|
|
from network.bmproto import BMProto
|
|
from network.connectionpool import BMConnectionPool
|
|
from network.udp import UDPSocket
|
|
import state
|
|
|
|
class AnnounceThread(threading.Thread, StoppableThread):
|
|
def __init__(self):
|
|
threading.Thread.__init__(self, name="AnnounceThread")
|
|
self.initStop()
|
|
self.name = "AnnounceThread"
|
|
logger.info("init announce thread")
|
|
|
|
def run(self):
|
|
lastSelfAnnounced = 0
|
|
while not self._stopped and state.shutdown == 0:
|
|
processed = 0
|
|
if lastSelfAnnounced < time.time() - UDPSocket.announceInterval:
|
|
self.announceSelf()
|
|
lastSelfAnnounced = time.time()
|
|
if processed == 0:
|
|
self.stop.wait(10)
|
|
|
|
def announceSelf(self):
|
|
for connection in BMConnectionPool().udpSockets.values():
|
|
for stream in state.streamsInWhichIAmParticipating:
|
|
addr = (stream, state.Peer('127.0.0.1', BMConfigParser().safeGetInt("bitmessagesettings", "port")), time.time())
|
|
connection.append_write_buf(BMProto.assembleAddr([addr]))
|