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

lock on the spectrum thread to avoid double start

Browse Source
This commit is contained in:
Jakob Ketterl 2020-08-30 17:35:53 +02:00
parent 820ca16cd9
commit 32105538c5
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
owrx/source/__init__.py
View File

@ -54,6 +54,7 @@ class SdrSource(ABC):
self.clients = [] self.clients = []
self.spectrumClients = [] self.spectrumClients = []
self.spectrumThread = None self.spectrumThread = None
self.spectrumLock = threading.Lock()
self.process = None self.process = None
self.modificationLock = threading.Lock() self.modificationLock = threading.Lock()
self.failed = False self.failed = False
@ -263,11 +264,12 @@ class SdrSource(ABC):
self.stop() self.stop()
def addSpectrumClient(self, c): def addSpectrumClient(self, c):
self.spectrumClients.append(c)
if self.spectrumThread is None:
# local import due to circular depencency # local import due to circular depencency
from owrx.fft import SpectrumThread from owrx.fft import SpectrumThread
self.spectrumClients.append(c)
with self.spectrumLock:
if self.spectrumThread is None:
self.spectrumThread = SpectrumThread(self) self.spectrumThread = SpectrumThread(self)
self.spectrumThread.start() self.spectrumThread.start()
@ -276,6 +278,7 @@ class SdrSource(ABC):
self.spectrumClients.remove(c) self.spectrumClients.remove(c)
except ValueError: except ValueError:
pass pass
with self.spectrumLock:
if not self.spectrumClients and self.spectrumThread is not None: if not self.spectrumClients and self.spectrumThread is not None:
self.spectrumThread.stop() self.spectrumThread.stop()
self.spectrumThread = None self.spectrumThread = None