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

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
Conversation 0 Commits 3 Files Changed 11 +2 -6
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49e89ecdf2 - Show all commits

1
src/network/__init__.py
View File

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

2
src/network/addrthread.py
View File

@ -7,7 +7,7 @@ from six.moves import queue
# magic imports! # magic imports!
import connectionpool import connectionpool
from protocol import assembleAddrMessage 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
Copy Link

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
Copy Link

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 from threads import StoppableThread

5
src/queues.py
View File

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