Fix #1174 by performing shutdown speed optimizations

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

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index ecdacdefa6ec09d53c6a1e8b343b40e6f661e96b..f7057d06e07cef8ecf6d232ee48308ffcab47de4 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -158,7 +158,8 @@ void DecodeSignal::reset_decode(bool shutting_down)
 
        if (!error_message_.isEmpty()) {
                error_message_ = QString();
-               qDebug().noquote().nospace() << name() << ": Error cleared";
+               // TODO Emulate noquote()
+               qDebug().nospace() << name() << ": Error cleared";
        }
 
        decode_reset();
@@ -588,7 +589,8 @@ void DecodeSignal::restore_settings(QSettings &settings)
 void DecodeSignal::set_error_message(QString msg)
 {
        error_message_ = msg;
-       qDebug().noquote().nospace() << name() << ": " << msg;
+       // TODO Emulate noquote()
+       qDebug().nospace() << name() << ": " << msg;
 }
 
 uint32_t DecodeSignal::get_input_segment_count() const
@@ -785,7 +787,9 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c
        uint8_t* output = new uint8_t[(end - start) * output_segment->unit_size()];
        unsigned int signal_count = signal_data.size();
 
-       for (int64_t sample_cnt = 0; sample_cnt < (end - start); sample_cnt++) {
+       for (int64_t sample_cnt = 0; !logic_mux_interrupt_ && (sample_cnt < (end - start));
+               sample_cnt++) {
+
                int bitpos = 0;
                uint8_t bytepos = 0;
 
@@ -855,7 +859,7 @@ void DecodeSignal::logic_mux_proc()
 
                                // ...and process the newly muxed logic data
                                decode_input_cond_.notify_one();
-                       } while (processed_samples < samples_to_process);
+                       } while (!logic_mux_interrupt_ && (processed_samples < samples_to_process));
                }
 
                if (samples_to_process == 0) {
@@ -1141,6 +1145,9 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa
        DecodeSignal *const ds = (DecodeSignal*)decode_signal;
        assert(ds);
 
+       if (ds->decode_interrupt_)
+               return;
+
        lock_guard<mutex> lock(ds->output_mutex_);
 
        // Find the row