DecodeSignal: Remove global SRD mutex

[pulseview.git] / pv / data / decodesignal.cpp

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 49b76f2aa9cedd87533031cadd512d50e1589ab2..6ac66a1ab2af6cbd9e25e5e5f1bac00bf98f2389 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -29,6 +29,7 @@
 #include <pv/binding/decoder.hpp>
 #include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/row.hpp>
+#include <pv/globalsettings.hpp>
 #include <pv/session.hpp>
 
 using std::lock_guard;
@@ -48,8 +49,6 @@ const double DecodeSignal::DecodeMargin = 1.0;
 const double DecodeSignal::DecodeThreshold = 0.2;
 const int64_t DecodeSignal::DecodeChunkLength = 256 * 1024;
 
-mutex DecodeSignal::global_srd_mutex_;
-
 
 DecodeSignal::DecodeSignal(pv::Session &session) :
        SignalBase(nullptr, SignalBase::DecodeChannel),
@@ -422,6 +421,22 @@ void DecodeSignal::save_settings(QSettings &settings) const
 
                settings.setValue("id", decoder->decoder()->id);
 
+               // Save decoder options
+               const map<string, GVariant*>& options = decoder->options();
+
+               settings.setValue("options", (int)options.size());
+
+               // Note: decode::Decoder::options() returns only the options
+               // that differ from the default. See binding::Decoder::getter()
+               int i = 0;
+               for (auto option : options) {
+                       settings.beginGroup("option" + QString::number(i));
+                       settings.setValue("name", QString::fromStdString(option.first));
+                       GlobalSettings::store_gvariant(settings, option.second);
+                       settings.endGroup();
+                       i++;
+               }
+
                settings.endGroup();
        }
 
@@ -447,8 +462,6 @@ void DecodeSignal::save_settings(QSettings &settings) const
 
                settings.endGroup();
        }
-
-       // TODO Save decoder options
 }
 
 void DecodeSignal::restore_settings(QSettings &settings)
@@ -471,7 +484,21 @@ void DecodeSignal::restore_settings(QSettings &settings)
                                continue;
 
                        if (QString::fromUtf8(dec->id) == id) {
-                               stack_.push_back(make_shared<decode::Decoder>(dec));
+                               shared_ptr<decode::Decoder> decoder =
+                                       make_shared<decode::Decoder>(dec);
+
+                               stack_.push_back(decoder);
+
+                               // Restore decoder options that differ from their default
+                               int options = settings.value("options").toInt();
+
+                               for (int i = 0; i < options; i++) {
+                                       settings.beginGroup("option" + QString::number(i));
+                                       QString name = settings.value("name").toString();
+                                       GVariant *value = GlobalSettings::restore_gvariant(settings);
+                                       decoder->set_option(name.toUtf8(), value);
+                                       settings.endGroup();
+                               }
 
                                // Include the newly created decode channels in the channel lists
                                update_channel_list();
@@ -511,8 +538,6 @@ void DecodeSignal::restore_settings(QSettings &settings)
        }
 
        begin_decode();
-
-       // TODO Restore decoder options
 }
 
 void DecodeSignal::update_channel_list()
@@ -795,13 +820,8 @@ void DecodeSignal::decode_proc()
        do {
                // Keep processing new samples until we exhaust the input data
                do {
-                       // Prevent any other decode threads from accessing libsigrokdecode
-                       lock_guard<mutex> srd_lock(global_srd_mutex_);
-
-                       {
-                               lock_guard<mutex> input_lock(input_mutex_);
-                               sample_count = segment_->get_sample_count() - abs_start_samplenum;
-                       }
+                       lock_guard<mutex> input_lock(input_mutex_);
+                       sample_count = segment_->get_sample_count() - abs_start_samplenum;
 
                        if (sample_count > 0) {
                                decode_data(abs_start_samplenum, sample_count);