Browse Source

AudioInputDevice: guard the FIFO list against concurrent changes

writeData() runs on the audio input thread and iterates m_audioFifos
without a lock, while addFifo()/removeFifo() are called from other
threads. A modulator with audio input (e.g. SSB Mod) removes and re-adds
its FIFO each time it starts, so starting a Tx device while audio is
flowing could crash in AudioFifo::write() (SIGSEGV in
QBasicMutex::lockInternal) when the list changed under the iteration.
Keying the transmitter often (e.g. FT8 via WSJT-X) hit it within hours.

Protect the list with its own mutex, held only for the list operations.
m_mutex is left alone, so this does not bring back the lockups the
commented out lock in writeData() was removed for.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
chirpmodem-v8.0.0
Michał Słomkowski 1 month ago
parent
commit
9fc140bddb
  1. 7
      sdrbase/audio/audioinputdevice.cpp
  2. 4
      sdrbase/audio/audioinputdevice.h

7
sdrbase/audio/audioinputdevice.cpp

@ -187,14 +187,14 @@ void AudioInputDevice::stop() @@ -187,14 +187,14 @@ void AudioInputDevice::stop()
void AudioInputDevice::addFifo(AudioFifo* audioFifo)
{
QMutexLocker mutexLocker(&m_mutex);
QMutexLocker mutexLocker(&m_fifosMutex);
m_audioFifos.push_back(audioFifo);
}
void AudioInputDevice::removeFifo(AudioFifo* audioFifo)
{
QMutexLocker mutexLocker(&m_mutex);
QMutexLocker mutexLocker(&m_fifosMutex);
m_audioFifos.remove(audioFifo);
}
@ -230,6 +230,9 @@ qint64 AudioInputDevice::writeData(const char *data, qint64 len) @@ -230,6 +230,9 @@ qint64 AudioInputDevice::writeData(const char *data, qint64 len)
return 0;
}
// FIFOs are added and removed from other threads (e.g. a modulator being started)
QMutexLocker mutexLocker(&m_fifosMutex);
for (std::list<AudioFifo*>::iterator it = m_audioFifos.begin(); it != m_audioFifos.end(); ++it)
{
(*it)->write(reinterpret_cast<const quint8*>(data), len/4);

4
sdrbase/audio/audioinputdevice.h

@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#ifndef SDRBASE_AUDIO_AUDIOINPUTDEVICE_H_
#define SDRBASE_AUDIO_AUDIOINPUTDEVICE_H_
#include <QMutex>
#include <QRecursiveMutex>
#include <QIODevice>
#include <QAudioFormat>
@ -114,7 +115,7 @@ public: @@ -114,7 +115,7 @@ public:
void addFifo(AudioFifo* audioFifo);
void removeFifo(AudioFifo* audioFifo);
int getNbFifos() const { return m_audioFifos.size(); }
int getNbFifos() const { QMutexLocker mutexLocker(&m_fifosMutex); return m_audioFifos.size(); }
uint getRate() const { return m_audioFormat.sampleRate(); }
void setOnExit(bool onExit) { m_onExit = onExit; }
@ -126,6 +127,7 @@ public: @@ -126,6 +127,7 @@ public:
private:
QRecursiveMutex m_mutex;
mutable QMutex m_fifosMutex; //!< guards m_audioFifos, which writeData reads on the audio thread
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QAudioSource* m_audioInput;
#else

Loading…
Cancel
Save