Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No Spin-lock for xxxProcessor, unclear what the gain was #714

Merged
merged 1 commit into from
Mar 4, 2019
Merged

No Spin-lock for xxxProcessor, unclear what the gain was #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/process/SpectrumVisualProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@ SpectrumVisualProcessor::~SpectrumVisualProcessor() {

bool SpectrumVisualProcessor::isView() {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

return is_view;
}

void SpectrumVisualProcessor::setView(bool bView) {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

is_view = bView;
}

void SpectrumVisualProcessor::setView(bool bView, long long centerFreq_in, long bandwidth_in) {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);
is_view = bView;
bandwidth = bandwidth_in;
centerFreq = centerFreq_in;
Expand All @@ -72,49 +72,49 @@ void SpectrumVisualProcessor::setView(bool bView, long long centerFreq_in, long

void SpectrumVisualProcessor::setFFTAverageRate(float fftAverageRate) {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

this->fft_average_rate = fftAverageRate;
}

float SpectrumVisualProcessor::getFFTAverageRate() {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

return this->fft_average_rate;
}

void SpectrumVisualProcessor::setCenterFrequency(long long centerFreq_in) {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

centerFreq = centerFreq_in;
}

long long SpectrumVisualProcessor::getCenterFrequency() {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

return centerFreq;
}

void SpectrumVisualProcessor::setBandwidth(long bandwidth_in) {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

bandwidth = bandwidth_in;
}

long SpectrumVisualProcessor::getBandwidth() {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

return bandwidth;
}

void SpectrumVisualProcessor::setPeakHold(bool peakHold_in) {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

if (peakHold && peakHold_in) {
peakReset = PEAK_RESET_COUNT;
Expand All @@ -126,20 +126,20 @@ void SpectrumVisualProcessor::setPeakHold(bool peakHold_in) {

bool SpectrumVisualProcessor::getPeakHold() {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

return peakHold;
}

int SpectrumVisualProcessor::getDesiredInputSize() {
std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

return desiredInputSize;
}

void SpectrumVisualProcessor::setup(unsigned int fftSize_in) {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

fftSize = fftSize_in;
fftSizeInternal = fftSize_in * SPECTRUM_VZM;
Expand Down Expand Up @@ -180,7 +180,7 @@ void SpectrumVisualProcessor::setup(unsigned int fftSize_in) {
void SpectrumVisualProcessor::setFFTSize(unsigned int fftSize_in) {

//then get the busy_lock
std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

if (fftSize_in == fftSize) {
return;
Expand All @@ -192,7 +192,7 @@ void SpectrumVisualProcessor::setFFTSize(unsigned int fftSize_in) {
unsigned int SpectrumVisualProcessor::getFFTSize() {

//then get the busy_lock
std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

if (fftSizeChanged) {
return newFFTSize;
Expand All @@ -203,7 +203,7 @@ unsigned int SpectrumVisualProcessor::getFFTSize() {

void SpectrumVisualProcessor::setHideDC(bool hideDC) {

std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

this->hideDC = hideDC;
}
Expand All @@ -220,7 +220,7 @@ void SpectrumVisualProcessor::process() {
bool executeSetup = false;

{ // scoped lock here
std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);
if (fftSizeChanged) {
executeSetup = true;
fftSizeChanged = false;
Expand All @@ -242,7 +242,7 @@ void SpectrumVisualProcessor::process() {
}

//then get the busy_lock for the rest of the processing.
std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

bool doPeak = peakHold && (peakReset == 0);

Expand Down Expand Up @@ -638,14 +638,14 @@ void SpectrumVisualProcessor::process() {


void SpectrumVisualProcessor::setScaleFactor(float sf) {
std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);

scaleFactor = sf;
}


float SpectrumVisualProcessor::getScaleFactor() {
std::lock_guard < SpinMutex > busy_lock(busy_run);
std::lock_guard < std::mutex > busy_lock(busy_run);
return scaleFactor;
}

3 changes: 1 addition & 2 deletions src/process/SpectrumVisualProcessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "DemodDefs.h"
#include <cmath>
#include <memory>
#include "SpinMutex.h"

#define SPECTRUM_VZM 2
#define PEAK_RESET_COUNT 30
Expand Down Expand Up @@ -66,7 +65,7 @@ class SpectrumVisualProcessor : public VisualProcessor<DemodulatorThreadIQData,

private:
//protects all access to fields below
SpinMutex busy_run;
std::mutex busy_run;

bool is_view;
size_t fftSize, newFFTSize;
Expand Down
31 changes: 12 additions & 19 deletions src/process/VisualProcessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <algorithm>
#include <vector>
#include <typeinfo>
#include "SpinMutex.h"

template<typename InputDataType, typename OutputDataType>
class VisualProcessor {
Expand All @@ -29,7 +28,7 @@ class VisualProcessor {
}

bool isInputEmpty() {
std::lock_guard < SpinMutex > busy_lock(busy_update);
std::lock_guard < std::mutex > busy_lock(busy_update);

if (input) {
return input->empty();
Expand All @@ -39,7 +38,7 @@ class VisualProcessor {
}

bool isOutputEmpty() {
std::lock_guard < SpinMutex > busy_lock(busy_update);
std::lock_guard < std::mutex > busy_lock(busy_update);

for (VisualOutputQueueTypePtr single_output : outputs) {
if (single_output->full()) {
Expand All @@ -50,7 +49,7 @@ class VisualProcessor {
}

bool isAnyOutputEmpty() {
std::lock_guard < SpinMutex > busy_lock(busy_update);
std::lock_guard < std::mutex > busy_lock(busy_update);

for (VisualOutputQueueTypePtr single_output : outputs) {
if (!(single_output)->full()) {
Expand All @@ -62,7 +61,7 @@ class VisualProcessor {

//Set a (new) 'input' queue for incoming data.
void setInput(VisualInputQueueTypePtr vis_in) {
std::lock_guard < SpinMutex > busy_lock(busy_update);
std::lock_guard < std::mutex > busy_lock(busy_update);
input = vis_in;

}
Expand All @@ -71,14 +70,14 @@ class VisualProcessor {
//dispatched by distribute().
void attachOutput(VisualOutputQueueTypePtr vis_out) {
// attach an output queue
std::lock_guard < SpinMutex > busy_lock(busy_update);
std::lock_guard < std::mutex > busy_lock(busy_update);
outputs.push_back(vis_out);
}

//reverse of attachOutput(), removed an existing attached vis_out.
void removeOutput(VisualOutputQueueTypePtr vis_out) {
// remove an output queue
std::lock_guard < SpinMutex > busy_lock(busy_update);
std::lock_guard < std::mutex > busy_lock(busy_update);

auto it = std::find(outputs.begin(), outputs.end(), vis_out);
if (it != outputs.end()) {
Expand All @@ -99,7 +98,7 @@ class VisualProcessor {
//scoped-lock: create a local copy of outputs, and work with it.
std::vector<VisualOutputQueueTypePtr> local_outputs;
{
std::lock_guard < SpinMutex > busy_lock(busy_update);
std::lock_guard < std::mutex > busy_lock(busy_update);
local_outputs = outputs;
}

Expand Down Expand Up @@ -133,17 +132,11 @@ class VisualProcessor {
//* \param[in] errorMessage an error message written on std::cout in case pf push timeout.
void distribute(OutputDataTypePtr item, std::uint64_t timeout = BLOCKING_INFINITE_TIMEOUT, const char* errorMessage = nullptr) {

//scoped-lock: create a local copy of outputs, and work with it.
std::vector<VisualOutputQueueTypePtr> local_outputs;
{
std::lock_guard < SpinMutex > busy_lock(busy_update);
local_outputs = outputs;
}
std::lock_guard < std::mutex > busy_lock(busy_update);
//We will try to distribute 'output' among all 'outputs',
//so 'output' will a-priori be shared among all 'outputs'.

//We will try to distribute 'output' among all 'local_outputs',
//so 'output' will a-priori be shared among all 'local_outputs'.

for (VisualOutputQueueTypePtr single_output : local_outputs) {
for (VisualOutputQueueTypePtr single_output : outputs) {
//'output' can fail to be given to an single_output,
//using a blocking push, with a timeout
if (!(single_output)->push(item, timeout, errorMessage)) {
Expand All @@ -159,7 +152,7 @@ class VisualProcessor {
std::vector<VisualOutputQueueTypePtr> outputs;

//protects input and outputs
SpinMutex busy_update;
std::mutex busy_update;
};

//Specialization much like VisualDataReDistributor, except
Expand Down