VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-13 20:12:29 -04:00
Code Issues Projects Releases Wiki Activity

Fix memory leak and race condition relating to DSP*Engines. Part of #2159

Browse Source
This commit is contained in:
srcejon 2024-11-14 11:42:53 +00:00
parent 7c7a7d7c1e
commit 6dcc342c10
3 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdrbase/dsp/dspengine.cpp
View File

@ -187,39 +187,41 @@ void DSPEngine::removeLastDeviceMIMOEngine()
}
}
QThread * DSPEngine::removeDeviceEngineAt(int deviceIndex)
QThread *DSPEngine::getDeviceEngineThread(int deviceIndex)
{
if (deviceIndex >= m_deviceEngineReferences.size()) {
return nullptr;
} else {
return m_deviceEngineReferences[deviceIndex].m_thread;
}
}
QThread *deviceThread = nullptr;
void DSPEngine::removeDeviceEngineAt(int deviceIndex)
{
if (deviceIndex >= m_deviceEngineReferences.size()) {
return;
}
if (m_deviceEngineReferences[deviceIndex].m_deviceEngineType == 0) // source
{
DSPDeviceSourceEngine *deviceEngine = m_deviceEngineReferences[deviceIndex].m_deviceSourceEngine;
deviceThread = m_deviceEngineReferences[deviceIndex].m_thread;
deviceThread->exit();
m_deviceEngineReferences[deviceIndex].m_thread->exit();
m_deviceSourceEngines.removeAll(deviceEngine);
}
else if (m_deviceEngineReferences[deviceIndex].m_deviceEngineType == 1) // sink
{
DSPDeviceSinkEngine *deviceEngine = m_deviceEngineReferences[deviceIndex].m_deviceSinkEngine;
deviceThread = m_deviceEngineReferences[deviceIndex].m_thread;
deviceThread->exit();
m_deviceEngineReferences[deviceIndex].m_thread->exit();
m_deviceSinkEngines.removeAll(deviceEngine);
}
else if (m_deviceEngineReferences[deviceIndex].m_deviceEngineType == 2) // MIMO
{
DSPDeviceMIMOEngine *deviceEngine = m_deviceEngineReferences[deviceIndex].m_deviceMIMOEngine;
deviceThread = m_deviceEngineReferences[deviceIndex].m_thread;
deviceThread->exit();
m_deviceEngineReferences[deviceIndex].m_thread->exit();
m_deviceMIMOEngines.removeAll(deviceEngine);
}
m_deviceEngineReferences.removeAt(deviceIndex);
return deviceThread;
}
void DSPEngine::createFFTFactory(const QString& fftWisdomFileName)

3
sdrbase/dsp/dspengine.h
View File

@ -53,7 +53,8 @@ public:
DSPDeviceMIMOEngine *addDeviceMIMOEngine();
void removeLastDeviceMIMOEngine();
QThread *removeDeviceEngineAt(int deviceIndex);
QThread *getDeviceEngineThread(int deviceIndex);
void removeDeviceEngineAt(int deviceIndex);
AudioDeviceManager *getAudioDeviceManager() { return &m_audioDeviceManager; }

29
sdrgui/mainwindow.cpp
View File

@ -778,10 +778,19 @@ void RemoveDeviceSetFSM::removeUI()
void RemoveDeviceSetFSM::stopEngine()
{
qDebug() << "RemoveDeviceSetFSM::stopEngine";
QThread *thread = m_mainWindow->m_dspEngine->removeDeviceEngineAt(m_deviceSetIndex);
if (thread && !thread->isFinished()) // FIXME: Is there a race condition here? We might need to connect before calling thread->exit
QThread *thread = m_mainWindow->m_dspEngine->getDeviceEngineThread(m_deviceSetIndex);
if (thread)
{
connect(thread, &QThread::finished, m_mainWindow, &MainWindow::engineStopped);
bool finished = thread->isFinished();
if (!finished) {
connect(thread, &QThread::finished, m_mainWindow, &MainWindow::engineStopped);
}
m_mainWindow->m_dspEngine->removeDeviceEngineAt(m_deviceSetIndex);
if (finished) {
emit m_mainWindow->engineStopped();
}
}
else
{
@ -801,12 +810,20 @@ void RemoveDeviceSetFSM::removeDeviceSet()
DeviceAPI *deviceAPI = m_deviceUISet->m_deviceAPI;
delete m_deviceUISet;
if (m_deviceSourceEngine) {
if (m_deviceSourceEngine)
{
delete deviceAPI->getSampleSource();
} else if (m_deviceSinkEngine) {
delete m_deviceSourceEngine;
}
else if (m_deviceSinkEngine)
{
delete deviceAPI->getSampleSink();
} else {
delete m_deviceSinkEngine;
}
else
{
delete deviceAPI->getSampleMIMO();
delete m_deviceMIMOEngine;
}
delete deviceAPI;