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

protect the wave file switchover with a lock, since race conditions have

Browse Source 
occured
This commit is contained in:
Jakob Ketterl 2019-07-10 22:09:31 +02:00
parent 2536d9f747
commit cb0b950d34
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
owrx/wsjt.py
View File

@ -17,6 +17,7 @@ class Ft8Chopper(threading.Thread):
def __init__(self, source): def __init__(self, source):
self.source = source self.source = source
(self.wavefilename, self.wavefile) = self.getWaveFile() (self.wavefilename, self.wavefile) = self.getWaveFile()
self.switchingLock = threading.Lock()
self.scheduler = sched.scheduler(time.time, time.sleep) self.scheduler = sched.scheduler(time.time, time.sleep)
self.fileQueue = [] self.fileQueue = []
(self.outputReader, self.outputWriter) = Pipe() (self.outputReader, self.outputWriter) = Pipe()
@ -53,9 +54,11 @@ class Ft8Chopper(threading.Thread):
self.scheduler.enterabs(self.getNextDecodingTime(), 1, self.switchFiles) self.scheduler.enterabs(self.getNextDecodingTime(), 1, self.switchFiles)
def switchFiles(self): def switchFiles(self):
self.switchingLock.acquire()
file = self.wavefile file = self.wavefile
filename = self.wavefilename filename = self.wavefilename
(self.wavefilename, self.wavefile) = self.getWaveFile() (self.wavefilename, self.wavefile) = self.getWaveFile()
self.switchingLock.release()
file.close() file.close()
self.fileQueue.append(filename) self.fileQueue.append(filename)
@ -90,7 +93,9 @@ class Ft8Chopper(threading.Thread):
logger.warning("zero read on ft8 chopper") logger.warning("zero read on ft8 chopper")
self.doRun = False self.doRun = False
else: else:
self.switchingLock.acquire()
self.wavefile.writeframes(data) self.wavefile.writeframes(data)
self.switchingLock.release()
self.decode() self.decode()
logger.debug("FT8 chopper shutting down") logger.debug("FT8 chopper shutting down")