joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use normal queue since we're not even multiprocessing

Browse Source
This commit is contained in:
Jakob Ketterl 2020-08-05 19:07:55 +02:00
parent 7ea8c8f7c6
commit 7234ff4309
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
owrx/connection.py
View File

@ -12,8 +12,7 @@ from owrx.bookmarks import Bookmarks
from owrx.map import Map from owrx.map import Map
from owrx.property import PropertyStack from owrx.property import PropertyStack
from owrx.modes import Modes, DigitalMode from owrx.modes import Modes, DigitalMode
from multiprocessing import Queue from queue import Queue, Full
from queue import Full
from js8py import Js8Frame from js8py import Js8Frame
from abc import ABC, ABCMeta, abstractmethod from abc import ABC, ABCMeta, abstractmethod
import json import json
@ -27,21 +26,21 @@ logger = logging.getLogger(__name__)
class Client(ABC): class Client(ABC):
def __init__(self, conn): def __init__(self, conn):
self.conn = conn self.conn = conn
self.multiprocessingPipe = Queue(100) self.multithreadingPipe = Queue(100)
def mp_passthru(): def mp_passthru():
run = True run = True
while run: while run:
try: try:
data = self.multiprocessingPipe.get() data = self.multithreadingPipe.get()
self.send(data) self.send(data)
except (EOFError, OSError, ValueError): except (EOFError, OSError, ValueError):
run = False run = False
except Exception: except Exception:
logger.exception("Exception on client multiprocessing queue") logger.exception("Exception on client multithreading queue")
# unset the queue object to free shared memory file descriptors # unset the queue object to free shared memory file descriptors
self.multiprocessingPipe = None self.multithreadingPipe = None
threading.Thread(target=mp_passthru).start() threading.Thread(target=mp_passthru).start()
@ -53,14 +52,12 @@ class Client(ABC):
def close(self): def close(self):
self.conn.close() self.conn.close()
if self.multiprocessingPipe is not None:
self.multiprocessingPipe.close()
def mp_send(self, data): def mp_send(self, data):
if self.multiprocessingPipe is None: if self.multithreadingPipe is None:
return return
try: try:
self.multiprocessingPipe.put(data, block=False) self.multithreadingPipe.put(data, block=False)
except Full: except Full:
self.close() self.close()