VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

Attempt to fix race condition in glScope traces processing

Browse Source
This commit is contained in:
f4exb 2018-11-19 18:49:12 +01:00
parent b63c778925
commit 7d9ca913ec
3 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sdrgui/dsp/scopevis.cpp
View File

@ -607,15 +607,24 @@ int ScopeVis::processTraces(const SampleVector::const_iterator& cbegin, const Sa
float traceTime = ((float) m_traceSize) / m_sampleRate;
if (traceTime >= 1.0f) { // display continuously if trace time is 1 second or more
m_glScope->newTraces(&m_traces.m_traces[m_traces.currentBufferIndex()]);
m_glScope->newTraces(m_traces.m_traces, m_traces.currentBufferIndex());
}
if (m_nbSamples == 0) // finished
{
if (traceTime < 1.0f) { // display only at trace end if trace time is less than 1 second
m_glScope->newTraces(&m_traces.m_traces[m_traces.currentBufferIndex()]);
// display only at trace end if trace time is less than 1 second
if (traceTime < 1.0f)
{
if (m_glScope->getProcessingTraceIndex().load() < 0) {
m_glScope->newTraces(m_traces.m_traces, m_traces.currentBufferIndex());
}
}
m_traces.switchBuffer();
// switch to next buffer only if it is not being processed by the scope
if (m_glScope->getProcessingTraceIndex().load() != ((m_traces.currentBufferIndex() + 1) % 2)) {
m_traces.switchBuffer();
}
return end - begin; // return remainder count
}
else

25
sdrgui/gui/glscope.cpp
View File

@ -30,6 +30,7 @@ GLScope::GLScope(QWidget* parent) :
QGLWidget(parent),
m_tracesData(0),
m_traces(0),
m_processingTraceIndex(-1),
m_bufferIndex(0),
m_displayMode(DisplayX),
m_dataChanged(false),
@ -112,6 +113,21 @@ void GLScope::newTraces(std::vector<float *>* traces)
}
}
void GLScope::newTraces(std::vector<float *>* traces, int traceIndex)
{
if (traces->size() > 0)
{
if(!m_mutex.tryLock(2))
return;
m_processingTraceIndex.store(traceIndex);
m_traces = &traces[traceIndex];
m_dataChanged = true;
m_mutex.unlock();
}
}
void GLScope::initializeGL()
{
QOpenGLContext *glCurrentContext = QOpenGLContext::currentContext();
@ -176,11 +192,15 @@ void GLScope::resizeGL(int width, int height)
void GLScope::paintGL()
{
if(!m_mutex.tryLock(2))
if (!m_mutex.tryLock(2))
{
m_processingTraceIndex.store(-1);
return;
}
if(m_configChanged)
if (m_configChanged) {
applyConfig();
}
// qDebug("GLScope::paintGL: m_traceCounter: %d", m_traceCounter);
// m_traceCounter = 0;
@ -920,6 +940,7 @@ void GLScope::paintGL()
} // trace length > 0
} // XY mixed + polar display
m_processingTraceIndex.store(-1);
m_mutex.unlock();
}

5
sdrgui/gui/glscope.h
View File

@ -24,6 +24,8 @@
#include <QMutex>
#include <QFont>
#include <QMatrix4x4>
#include <QAtomicInt>
#include "dsp/dsptypes.h"
#include "dsp/scopevis.h"
#include "gui/scaleengine.h"
@ -54,6 +56,7 @@ public:
void setTraces(std::vector<ScopeVis::TraceData>* tracesData, std::vector<float *>* traces);
void newTraces(std::vector<float *>* traces);
void newTraces(std::vector<float *>* traces, int traceIndex);
int getSampleRate() const { return m_sampleRate; }
int getTraceSize() const { return m_traceSize; }
@ -75,6 +78,7 @@ public:
bool getDataChanged() const { return m_dataChanged; }
DisplayMode getDisplayMode() const { return m_displayMode; }
void setDisplayXYPoints(bool value) { m_displayXYPoints = value; }
const QAtomicInt& getProcessingTraceIndex() const { return m_processingTraceIndex; }
signals:
void sampleRateChanged(int);
@ -84,6 +88,7 @@ signals:
private:
std::vector<ScopeVis::TraceData> *m_tracesData;
std::vector<float *> *m_traces;
QAtomicInt m_processingTraceIndex;
ScopeVis::TriggerData m_focusedTriggerData;
//int m_traceCounter;
uint32_t m_bufferIndex;