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

use better locking for the service startup/shutdown

Browse Source
This commit is contained in:
Jakob Ketterl 2020-07-30 21:35:31 +02:00
parent c8e5b4f822
commit 7ea8c8f7c6
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
owrx/service/__init__.py
View File

@ -61,7 +61,7 @@ class Js8ServiceOutput(ServiceOutput):
class ServiceHandler(object): class ServiceHandler(object):
def __init__(self, source): def __init__(self, source):
self.lock = threading.Lock() self.lock = threading.RLock()
self.services = [] self.services = []
self.source = source self.source = source
self.startupTimer = None self.startupTimer = None
@ -124,30 +124,28 @@ class ServiceHandler(object):
self.startupTimer.start() self.startupTimer.start()
def updateServices(self): def updateServices(self):
logger.debug("re-scheduling services due to sdr changes")
self.stopServices()
if not self.source.isAvailable():
logger.debug("sdr source is unavailable")
return
cf = self.source.getProps()["center_freq"]
sr = self.source.getProps()["samp_rate"]
srh = sr / 2
frequency_range = (cf - srh, cf + srh)
dials = [
dial
for dial in Bandplan.getSharedInstance().collectDialFrequencies(
frequency_range
)
if self.isSupported(dial["mode"])
]
if not dials:
logger.debug("no services available")
return
with self.lock: with self.lock:
self.services = [] logger.debug("re-scheduling services due to sdr changes")
self.stopServices()
if not self.source.isAvailable():
logger.debug("sdr source is unavailable")
return
cf = self.source.getProps()["center_freq"]
sr = self.source.getProps()["samp_rate"]
srh = sr / 2
frequency_range = (cf - srh, cf + srh)
dials = [
dial
for dial in Bandplan.getSharedInstance().collectDialFrequencies(
frequency_range
)
if self.isSupported(dial["mode"])
]
if not dials:
logger.debug("no services available")
return
groups = self.optimizeResampling(dials, sr) groups = self.optimizeResampling(dials, sr)
if groups is None: if groups is None: