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

Perseus: updated threading model. Part of #1346

Browse Source
This commit is contained in:
f4exb 2022-10-08 13:20:17 +02:00
parent edab4f0b33
commit 17d5f14cac
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/samplesource/perseus/perseusinput.cpp
View File

@ -18,6 +18,7 @@
#include <QDebug>
#include <QNetworkReply>
#include <QBuffer>
#include <QThread>
#include "SWGDeviceSettings.h"
#include "SWGDeviceState.h"
@ -78,19 +79,26 @@ void PerseusInput::init()
bool PerseusInput::start()
{
QMutexLocker mlock(&m_mutex);
if (m_running) {
stop();
return true;
}
// start / stop streaming is done in the thread.
m_perseusWorkerThread = new QThread();
m_perseusWorker = new PerseusWorker(m_perseusDescriptor, &m_sampleFifo);
m_perseusWorker->moveToThread(&m_perseusWorkerThread);
m_perseusWorker->moveToThread(m_perseusWorkerThread);
qDebug("PerseusInput::start: worker created");
QObject::connect(m_perseusWorkerThread, &QThread::started, m_perseusWorker, &PerseusWorker::startWork);
QObject::connect(m_perseusWorkerThread, &QThread::finished, m_perseusWorker, &QObject::deleteLater);
QObject::connect(m_perseusWorkerThread, &QThread::finished, m_perseusWorkerThread, &QThread::deleteLater);
m_perseusWorker->setIQOrder(m_settings.m_iqOrder);
m_perseusWorker->setLog2Decimation(m_settings.m_log2Decim);
startWorker();
m_perseusWorkerThread->start();
applySettings(m_settings, true);
m_running = true;
@ -100,27 +108,22 @@ bool PerseusInput::start()
void PerseusInput::stop()
{
if (m_perseusWorker)
{
stopWorker();
delete m_perseusWorker;
m_perseusWorker = nullptr;
QMutexLocker mlock(&m_mutex);
if (!m_running) {
return;
}
m_running = false;
if (m_perseusWorkerThread)
{
m_perseusWorkerThread->quit();
m_perseusWorkerThread->wait();
m_perseusWorker = nullptr;
m_perseusWorkerThread = nullptr;
}
void PerseusInput::startWorker()
{
m_perseusWorker->startWork();
m_perseusWorkerThread.start();
}
void PerseusInput::stopWorker()
{
m_perseusWorker->stopWork();
m_perseusWorkerThread.quit();
m_perseusWorkerThread.wait();
}
QByteArray PerseusInput::serialize() const
@ -336,7 +339,7 @@ bool PerseusInput::applySettings(const PerseusSettings& settings, bool force)
reverseAPIKeys.append("log2Decim");
forwardChange = true;
if (m_perseusWorker)
if (m_running)
{
m_perseusWorker->setLog2Decimation(settings.m_log2Decim);
qDebug("PerseusInput: set decimation to %d", (1<<settings.m_log2Decim));
@ -347,7 +350,7 @@ bool PerseusInput::applySettings(const PerseusSettings& settings, bool force)
{
reverseAPIKeys.append("iqOrder");
if (m_perseusWorker) {
if (m_running) {
m_perseusWorker->setIQOrder(settings.m_iqOrder);
}
}

8
plugins/samplesource/perseus/perseusinput.h
View File

@ -21,7 +21,7 @@
#include <vector>
#include <QNetworkRequest>
#include <QThread>
#include <QMutex>
#include "perseus-sdr.h"
#include "dsp/devicesamplesource.h"
@ -30,6 +30,7 @@
class QNetworkAccessManager;
class QNetworkReply;
class QThread;
class DeviceAPI;
class PerseusWorker;
@ -136,16 +137,15 @@ private:
DeviceAPI *m_deviceAPI;
QString m_deviceDescription;
PerseusSettings m_settings;
QMutex m_mutex;
bool m_running;
PerseusWorker *m_perseusWorker;
QThread m_perseusWorkerThread;
QThread *m_perseusWorkerThread;
perseus_descr *m_perseusDescriptor;
std::vector<uint32_t> m_sampleRates;
QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest;
void startWorker();
void stopWorker();
bool openDevice();
void closeDevice();
void setDeviceCenterFrequency(quint64 freq, const PerseusSettings& settings);