Fixed data race condition in spectrum vis when the FFT size is changed

f4exb · Oct 22, 2015 · 6a59ac7 · 6a59ac7
1 parent 91cab6c
commit 6a59ac7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/include/dsp/spectrumvis.h b/include/dsp/spectrumvis.h
@@ -1,6 +1,7 @@
 #ifndef INCLUDE_SPECTRUMVIS_H
 #define INCLUDE_SPECTRUMVIS_H
 
+#include <QMutex>
 #include "dsp/samplesink.h"
 #include "dsp/fftengine.h"
 #include "fftwindow.h"
@@ -61,6 +62,8 @@ class SDRANGEL_API SpectrumVis : public SampleSink {
 
 	GLSpectrum* m_glSpectrum;
 
+	QMutex m_mutex;
+
 	void handleConfigure(int fftSize, int overlapPercent, FFTWindow::Function window);
 };
 

diff --git a/sdrbase/dsp/spectrumvis.cpp b/sdrbase/dsp/spectrumvis.cpp
@@ -21,7 +21,8 @@ SpectrumVis::SpectrumVis(GLSpectrum* glSpectrum) :
 	m_logPowerSpectrum(MAX_FFT_SIZE),
 	m_fftBufferFill(0),
 	m_needMoreSamples(false),
-	m_glSpectrum(glSpectrum)
+	m_glSpectrum(glSpectrum),
+	m_mutex(QMutex::Recursive)
 {
 	setObjectName("SpectrumVis");
 	handleConfigure(1024, 0, FFTWindow::BlackmanHarris);
@@ -77,6 +78,8 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
 
 		if (todo >= samplesNeeded)
 		{
+			QMutexLocker mutexLocker(&m_mutex);
+
 			// fill up the buffer
 			std::vector<Complex>::iterator it = m_fftBuffer.begin() + m_fftBufferFill;
 
@@ -174,6 +177,8 @@ bool SpectrumVis::handleMessage(const Message& message)
 
 void SpectrumVis::handleConfigure(int fftSize, int overlapPercent, FFTWindow::Function window)
 {
+	QMutexLocker mutexLocker(&m_mutex);
+
 	if (fftSize > MAX_FFT_SIZE)
 	{
 		fftSize = MAX_FFT_SIZE;