X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecodesignal.cpp;h=610bfc4fe6e89771c678f33453bcef1ad78c474e;hb=1c552f400ee967f7a489853578c4d8d4bd2edfbf;hp=b9a1fabc74917fc2cc8791ed9ae7abe8ff04b38b;hpb=f5a26d5ea895f820c980326be6cee1d46cb958e3;p=pulseview.git diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index b9a1fabc..610bfc4f 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -231,9 +231,6 @@ void DecodeSignal::begin_decode() logic_mux_data_ = make_shared(ch_count); } - // Receive notifications when new sample data is available - connect_input_notifiers(); - if (get_input_segment_count() == 0) set_error_message(tr("No input data")); @@ -274,6 +271,9 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) { bool new_assignment = false; + // Disconnect all input signal notifications so we don't have duplicate connections + disconnect_input_notifiers(); + // Try to auto-select channels that don't have signals assigned yet for (decode::DecodeChannel& ch : channels_) { // If a decoder is given, auto-assign only its channels @@ -308,13 +308,22 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) } } - if (match) { + // Prevent using a signal more than once as D1 would match e.g. D1 and D10 + bool signal_not_already_used = true; + for (decode::DecodeChannel& ch : channels_) + if (ch.assigned_signal && (ch.assigned_signal == match)) + signal_not_already_used = false; + + if (match && signal_not_already_used) { ch.assigned_signal = match; new_assignment = true; } } if (new_assignment) { + // Receive notifications when new sample data is available + connect_input_notifiers(); + logic_mux_data_invalid_ = true; stack_config_changed_ = true; commit_decoder_channels(); @@ -324,12 +333,18 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) void DecodeSignal::assign_signal(const uint16_t channel_id, shared_ptr signal) { + // Disconnect all input signal notifications so we don't have duplicate connections + disconnect_input_notifiers(); + for (decode::DecodeChannel& ch : channels_) if (ch.id == channel_id) { ch.assigned_signal = signal; logic_mux_data_invalid_ = true; } + // Receive notifications when new sample data is available + connect_input_notifiers(); + stack_config_changed_ = true; commit_decoder_channels(); channels_updated(); @@ -457,7 +472,6 @@ vector DecodeSignal::get_rows(bool visible_only) const return rows; } - uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id) const { if (segment_id >= segments_.size()) @@ -1120,6 +1134,8 @@ void DecodeSignal::logic_mux_proc() // Logic mux data is being updated logic_mux_data_invalid_ = false; + connect_input_segment_notifiers(segment_id); + uint64_t samples_to_process; do { do { @@ -1158,6 +1174,9 @@ void DecodeSignal::logic_mux_proc() output_segment->set_complete(); if (segment_id < get_input_segment_count() - 1) { + + disconnect_input_segment_notifiers(segment_id); + // Process next segment segment_id++; @@ -1167,14 +1186,22 @@ void DecodeSignal::logic_mux_proc() logic_mux_data_->push_segment(output_segment); output_segment->set_samplerate(get_input_samplerate(segment_id)); + + connect_input_segment_notifiers(segment_id); + } else { + // Wait for more input data if we're processing the currently last segment + unique_lock logic_mux_lock(logic_mux_mutex_); + logic_mux_cond_.wait(logic_mux_lock); } } else { - // Wait for more input + // Input segments aren't all complete yet but samples_to_process is 0, wait for more input data unique_lock logic_mux_lock(logic_mux_mutex_); logic_mux_cond_.wait(logic_mux_lock); } } } while (!logic_mux_interrupt_); + + disconnect_input_segment_notifiers(segment_id); } void DecodeSignal::decode_data( @@ -1185,8 +1212,7 @@ void DecodeSignal::decode_data( const int64_t chunk_sample_count = DecodeChunkLength / unit_size; for (int64_t i = abs_start_samplenum; - error_message_.isEmpty() && !decode_interrupt_ && - (i < (abs_start_samplenum + sample_count)); + !decode_interrupt_ && (i < (abs_start_samplenum + sample_count)); i += chunk_sample_count) { const int64_t chunk_end = min(i + chunk_sample_count, @@ -1272,7 +1298,7 @@ void DecodeSignal::decode_proc() // If the input segment is complete, we've exhausted this segment if (input_segment->is_complete()) { - if (current_segment_id_ < logic_mux_data_->logic_segments().size() - 1) { + if (current_segment_id_ < (logic_mux_data_->logic_segments().size() - 1)) { // Process next segment current_segment_id_++; @@ -1298,12 +1324,17 @@ void DecodeSignal::decode_proc() // All segments have been processed if (!decode_interrupt_) decode_finished(); + + // Wait for more input data + unique_lock input_wait_lock(input_mutex_); + decode_input_cond_.wait(input_wait_lock); } } else { - // Wait for more input data + // Input segment isn't complete yet but samples_to_process is 0, wait for more input data unique_lock input_wait_lock(input_mutex_); decode_input_cond_.wait(input_wait_lock); } + } } while (!decode_interrupt_); } @@ -1413,23 +1444,75 @@ void DecodeSignal::stop_srd_session() void DecodeSignal::connect_input_notifiers() { - // Disconnect the notification slot from the previous set of signals - disconnect(this, SLOT(on_data_cleared())); - disconnect(this, SLOT(on_data_received())); - // Connect the currently used signals to our slot for (decode::DecodeChannel& ch : channels_) { if (!ch.assigned_signal) continue; + const data::SignalBase *signal = ch.assigned_signal.get(); + connect(signal, SIGNAL(samples_cleared()), + this, SLOT(on_data_cleared())); + connect(signal, SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)), + this, SLOT(on_data_received())); + } +} + +void DecodeSignal::disconnect_input_notifiers() +{ + // Disconnect the notification slot from the previous set of signals + for (decode::DecodeChannel& ch : channels_) { + if (!ch.assigned_signal) + continue; const data::SignalBase *signal = ch.assigned_signal.get(); - connect(signal, &data::SignalBase::samples_cleared, - this, &DecodeSignal::on_data_cleared); - connect(signal, &data::SignalBase::samples_added, - this, &DecodeSignal::on_data_received); + disconnect(signal, nullptr, this, SLOT(on_data_cleared())); + disconnect(signal, nullptr, this, SLOT(on_data_received())); } } +void DecodeSignal::connect_input_segment_notifiers(uint32_t segment_id) +{ + for (decode::DecodeChannel& ch : channels_) + if (ch.assigned_signal) { + const shared_ptr logic_data = ch.assigned_signal->logic_data(); + + shared_ptr segment; + if (segment_id < logic_data->logic_segments().size()) { + segment = logic_data->logic_segments().at(segment_id)->get_shared_ptr(); + } else { + qWarning() << "Signal" << name() << ":" << ch.assigned_signal->name() \ + << "has no logic segment, can't connect notifier" << segment_id; + continue; + } + + if (!segment) { + qWarning() << "Signal" << name() << ":" << ch.assigned_signal->name() \ + << "has no logic segment, can't connect notifier" << segment_id; + continue; + } + + connect(segment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed())); + } +} + +void DecodeSignal::disconnect_input_segment_notifiers(uint32_t segment_id) +{ + for (decode::DecodeChannel& ch : channels_) + if (ch.assigned_signal) { + const shared_ptr logic_data = ch.assigned_signal->logic_data(); + + shared_ptr segment; + if (segment_id < logic_data->logic_segments().size()) + segment = logic_data->logic_segments().at(segment_id)->get_shared_ptr(); + else + continue; + + if (!segment) + continue; + + disconnect(segment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed())); + } +} + void DecodeSignal::create_decode_segment() { // Create annotation segment @@ -1625,6 +1708,11 @@ void DecodeSignal::on_data_received() // to work with if ((!error_message_.isEmpty()) && (get_input_segment_count() == 0)) return; + else { + error_message_.clear(); + // TODO Emulate noquote() + qDebug().nospace() << name() << ": Error cleared"; + } if (!logic_mux_thread_.joinable()) begin_decode(); @@ -1632,6 +1720,12 @@ void DecodeSignal::on_data_received() logic_mux_cond_.notify_one(); } +void DecodeSignal::on_input_segment_completed() +{ + if (!logic_mux_thread_.joinable()) + logic_mux_cond_.notify_one(); +} + void DecodeSignal::on_annotation_visibility_changed() { annotation_visibility_changed();