Use SignalBase instead of LogicSignal for decoders

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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 2668df2937acb3e29035ab39ceffaf86953f1195..6f1eb1925dc3e34fe59e35e3343cb5f0e93e7fd0 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,7 +191,7 @@ void DecoderStack::clear()
 
 void DecoderStack::begin_decode()
 {
-       shared_ptr<pv::view::LogicSignal> logic_signal;
+       shared_ptr<pv::data::SignalBase> signalbase;
        shared_ptr<pv::data::Logic> data;
 
        if (decode_thread_.joinable()) {
@@ -241,11 +241,11 @@ 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
        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)) &&
+                       ((data = signalbase->logic_data())))
                        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;
 }
@@ -282,11 +282,22 @@ uint64_t DecoderStack::max_sample_count() const
 optional<int64_t> DecoderStack::wait_for_data() const
 {
        unique_lock<mutex> input_lock(input_mutex_);
+
+       // Do wait if we decoded all samples but we're still capturing
+       // Do not wait if we're done capturing
        while (!interrupt_ && !frame_complete_ &&
-               samples_decoded_ >= sample_count_)
+               (samples_decoded_ >= sample_count_) &&
+               (session_.get_capture_state() != Session::Stopped)) {
+
                input_cond_.wait(input_lock);
+       }
+
+       // Return value is valid if we're not aborting the decode,
        return boost::make_optional(!interrupt_ &&
-               (samples_decoded_ < sample_count_ || !frame_complete_),
+               // and there's more work to do...
+               (samples_decoded_ < sample_count_ || !frame_complete_) &&
+               // and if the end of the data hasn't been reached yet
+               (!((samples_decoded_ >= sample_count_) && (session_.get_capture_state() == Session::Stopped))),
                sample_count_);
 }
 
@@ -301,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);
@@ -333,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);