Moved Multiqueue, invQueue and addrQueue to network module #2256

Merged
anand-skss merged 3 commits from test3 into v0.6 2024-07-06 16:43:51 +02:00
3 changed files with 2 additions and 6 deletions
Showing only changes of commit 49e89ecdf2 - Show all commits

View File

@ -9,6 +9,7 @@ dandelion_ins = Dandelion()
# network queues
invQueue = MultiQueue()
addrQueue = MultiQueue()
__all__ = ["StoppableThread"]

View File

@ -7,7 +7,7 @@ from six.moves import queue
# magic imports!
import connectionpool
from protocol import assembleAddrMessage
from queues import addrQueue # FIXME: init with queue
from network import addrQueue # FIXME: init with queue
anand-skss commented 2024-06-23 07:45:28 +02:00 (Migrated from github.com)
Review

Please check Fixme comment, i'm not sure whether i remove this comment or not.

Please check Fixme comment, i'm not sure whether i remove this comment or not.
PeterSurda commented 2024-07-04 05:24:33 +02:00 (Migrated from github.com)
Review

I'm not sure either, let's leave it as it is.

I'm not sure either, let's leave it as it is.
from threads import StoppableThread

View File

@ -6,10 +6,6 @@ import time
from six.moves import queue
from network.multiqueue import MultiQueue
class ObjectProcessorQueue(queue.Queue):
"""Special queue class using lock for `.threads.objectProcessor`"""
@ -43,7 +39,6 @@ addressGeneratorQueue = queue.Queue()
#: `.network.ReceiveQueueThread` instances dump objects they hear
#: on the network into this queue to be processed.
objectProcessorQueue = ObjectProcessorQueue()
addrQueue = MultiQueue()
portCheckerQueue = queue.Queue()
receiveDataQueue = queue.Queue()
#: The address generator thread uses this queue to get information back