DecoderStack: Remove unneeded shared_ptr use

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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 51d4bae0483ec4ca2b1fb74abae54738f680bd0d..d01bab2de111b155c9880ecf72a4fd3806316e62 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -55,9 +55,9 @@ namespace data {
 const double DecoderStack::DecodeMargin = 1.0;
 const double DecoderStack::DecodeThreshold = 0.2;
 const int64_t DecoderStack::DecodeChunkLength = 4096;
-const unsigned int DecoderStack::DecodeNotifyPeriod = 65536;
+const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 
-mutex DecoderStack::global_decode_mutex_;
+mutex DecoderStack::global_srd_mutex_;
 
 DecoderStack::DecoderStack(pv::Session &session,
        const srd_decoder *const dec) :
@@ -191,9 +191,6 @@ void DecoderStack::clear()
 
 void DecoderStack::begin_decode()
 {
-       shared_ptr<pv::view::LogicSignal> logic_signal;
-       shared_ptr<pv::data::Logic> data;
-
        if (decode_thread_.joinable()) {
                interrupt_ = true;
                input_cond_.notify_one();
@@ -241,11 +238,14 @@ void DecoderStack::begin_decode()
 
        // We get the logic data of the first channel in the list.
        // This works because we are currently assuming all
-       // LogicSignals have the same data/segment
+       // logic signals have the same data/segment
+       pv::data::SignalBase *signalbase;
+       pv::data::Logic *data;
+
        for (const shared_ptr<decode::Decoder> &dec : stack_)
                if (dec && !dec->channels().empty() &&
-                       ((logic_signal = (*dec->channels().begin()).second)) &&
-                       ((data = logic_signal->logic_data())))
+                       ((signalbase = (*dec->channels().begin()).second.get())) &&
+                       ((data = signalbase->logic_data().get())))
                        break;
 
        if (!data)
@@ -272,9 +272,9 @@ uint64_t DecoderStack::max_sample_count() const
 {
        uint64_t max_sample_count = 0;
 
-       for (auto i = rows_.cbegin(); i != rows_.end(); i++)
+       for (const auto& row : rows_)
                max_sample_count = max(max_sample_count,
-                       (*i).second.get_max_sample());
+                       row.second.get_max_sample());
 
        return max_sample_count;
 }
@@ -312,7 +312,6 @@ void DecoderStack::decode_data(
 
        for (int64_t i = 0; !interrupt_ && i < sample_count;
                        i += chunk_sample_count) {
-               lock_guard<mutex> decode_lock(global_decode_mutex_);
 
                const int64_t chunk_end = min(
                        i + chunk_sample_count, sample_count);
@@ -344,6 +343,9 @@ void DecoderStack::decode_proc()
 
        assert(segment_);
 
+       // Prevent any other decode threads from accessing libsigrokdecode
+       lock_guard<mutex> srd_lock(global_srd_mutex_);
+
        // Create the session
        srd_session_new(&session);
        assert(session);