X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=be2ed1616d1bdbed47c4eeb604028ca654f1bfc7;hp=0e49398a44dc71757f6f2f531654629251adb2c6;hb=1b56c646e7dd253775b4d6cfceaf327fd8ffd297;hpb=e91883bb2d8e1f23078a7cd02bc5a7f4e3c9556c diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 0e49398a..be2ed161 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -46,8 +46,7 @@ namespace data { const double DecodeSignal::DecodeMargin = 1.0; const double DecodeSignal::DecodeThreshold = 0.2; -const int64_t DecodeSignal::DecodeChunkLength = 10 * 1024 * 1024; -const unsigned int DecodeSignal::DecodeNotifyPeriod = 1024; +const int64_t DecodeSignal::DecodeChunkLength = 256 * 1024; mutex DecodeSignal::global_srd_mutex_; @@ -59,35 +58,18 @@ DecodeSignal::DecodeSignal(pv::Session &session) : logic_mux_data_invalid_(false), start_time_(0), samplerate_(0), - annotation_count_(0), samples_decoded_(0), frame_complete_(false) { connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int))); - connect(&session_, SIGNAL(data_received()), - this, SLOT(on_data_received())); - connect(&session_, SIGNAL(frame_ended()), - this, SLOT(on_frame_ended())); set_name(tr("Empty decoder signal")); } DecodeSignal::~DecodeSignal() { - if (decode_thread_.joinable()) { - decode_interrupt_ = true; - decode_input_cond_.notify_one(); - decode_thread_.join(); - } - - if (logic_mux_thread_.joinable()) { - logic_mux_interrupt_ = true; - logic_mux_cond_.notify_one(); - logic_mux_thread_.join(); - } - - stop_srd_session(); + reset_decode(); } const vector< shared_ptr >& DecodeSignal::decoder_stack() const @@ -150,14 +132,29 @@ bool DecodeSignal::toggle_decoder_visibility(int index) void DecodeSignal::reset_decode() { + if (decode_thread_.joinable()) { + decode_interrupt_ = true; + decode_input_cond_.notify_one(); + decode_thread_.join(); + } + + if (logic_mux_thread_.joinable()) { + logic_mux_interrupt_ = true; + logic_mux_cond_.notify_one(); + logic_mux_thread_.join(); + } + stop_srd_session(); - annotation_count_ = 0; frame_complete_ = false; samples_decoded_ = 0; error_message_ = QString(); + rows_.clear(); class_rows_.clear(); + + logic_mux_data_.reset(); + logic_mux_data_invalid_ = true; } void DecodeSignal::begin_decode() @@ -188,6 +185,13 @@ void DecodeSignal::begin_decode() return; } + // Make sure that all assigned channels still provide logic data + // (can happen when a converted signal was assigned but the + // conversion removed in the meanwhile) + for (data::DecodeChannel &ch : channels_) + if (ch.assigned_signal && !(ch.assigned_signal->logic_data() != nullptr)) + ch.assigned_signal = nullptr; + // Check that all decoders have the required channels for (const shared_ptr &dec : stack_) if (!dec->have_required_channels()) { @@ -225,13 +229,6 @@ void DecodeSignal::begin_decode() } } - // TODO Currently we assume all channels have the same sample rate - auto any_channel = find_if(channels_.begin(), channels_.end(), - [](data::DecodeChannel ch) { return ch.assigned_signal; }); - shared_ptr first_segment = - any_channel->assigned_signal->logic_data()->logic_segments().front(); - samplerate_ = first_segment->samplerate(); - // Free the logic data and its segment(s) if it needs to be updated if (logic_mux_data_invalid_) logic_mux_data_.reset(); @@ -244,12 +241,6 @@ void DecodeSignal::begin_decode() logic_mux_data_->push_segment(segment_); } - // Update the samplerate and start time - start_time_ = segment_->start_time(); - samplerate_ = segment_->samplerate(); - if (samplerate_ == 0.0) - samplerate_ = 1.0; - // Make sure the logic output data is complete and up-to-date logic_mux_interrupt_ = false; logic_mux_thread_ = std::thread(&DecodeSignal::logic_mux_proc, this); @@ -257,6 +248,9 @@ void DecodeSignal::begin_decode() // Decode the muxed logic data decode_interrupt_ = false; decode_thread_ = std::thread(&DecodeSignal::decode_proc, this); + + // Receive notifications when new sample data is available + connect_input_notifiers(); } QString DecodeSignal::error_message() const @@ -279,11 +273,16 @@ void DecodeSignal::auto_assign_signals() if (ch.assigned_signal) continue; - for (shared_ptr s : session_.signalbases()) - if (s->logic_data() && (ch.name.toLower().contains(s->name().toLower()))) { + for (shared_ptr s : session_.signalbases()) { + const QString ch_name = ch.name.toLower(); + const QString s_name = s->name().toLower(); + + if (s->logic_data() && + ((ch_name.contains(s_name)) || (s_name.contains(ch_name)))) { ch.assigned_signal = s.get(); new_assignment = true; } + } } if (new_assignment) { @@ -424,11 +423,6 @@ void DecodeSignal::restore_settings(QSettings &settings) // TODO Restore decoder stack, channel mapping and decoder options } -uint64_t DecodeSignal::inc_annotation_count() -{ - return (annotation_count_++); -} - void DecodeSignal::update_channel_list() { vector prev_channels = channels_; @@ -588,7 +582,6 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) void DecodeSignal::logic_mux_proc() { do { - const uint64_t input_sample_count = get_working_sample_count(); const uint64_t output_sample_count = segment_->get_sample_count(); @@ -615,12 +608,12 @@ void DecodeSignal::logic_mux_proc() } while (processed_samples < samples_to_process); } - if (session_.get_capture_state() != Session::Stopped) { + if (samples_to_process == 0) { // Wait for more input unique_lock logic_mux_lock(logic_mux_mutex_); logic_mux_cond_.wait(logic_mux_lock); } - } while ((session_.get_capture_state() != Session::Stopped) && !logic_mux_interrupt_); + } while (!logic_mux_interrupt_); // No more input data and session is stopped, let the decode thread // process any pending data, terminate and release the global SRD mutex @@ -628,6 +621,39 @@ void DecodeSignal::logic_mux_proc() decode_input_cond_.notify_one(); } +void DecodeSignal::query_input_metadata() +{ + // Update the samplerate and start time because we cannot start + // the libsrd session without the current samplerate + + // TODO Currently we assume all channels have the same sample rate + // and start time + bool samplerate_valid = false; + + auto any_channel = find_if(channels_.begin(), channels_.end(), + [](data::DecodeChannel ch) { return ch.assigned_signal; }); + + shared_ptr logic_data = + any_channel->assigned_signal->logic_data(); + + do { + if (!logic_data->logic_segments().empty()) { + shared_ptr first_segment = + any_channel->assigned_signal->logic_data()->logic_segments().front(); + start_time_ = first_segment->start_time(); + samplerate_ = first_segment->samplerate(); + if (samplerate_ > 0) + samplerate_valid = true; + } + + if (!samplerate_valid) { + // Wait until input data is available or an interrupt was requested + unique_lock input_wait_lock(input_mutex_); + decode_input_cond_.wait(input_wait_lock); + } + } while (!samplerate_valid && !decode_interrupt_); +} + void DecodeSignal::decode_data( const int64_t abs_start_samplenum, const int64_t sample_count) { @@ -649,17 +675,27 @@ void DecodeSignal::decode_data( delete[] chunk; break; } + delete[] chunk; { lock_guard lock(output_mutex_); samples_decoded_ = chunk_end; } + + // Notify the frontend that we processed some data and + // possibly have new annotations as well + new_annotations(); } } void DecodeSignal::decode_proc() { + query_input_metadata(); + + if (decode_interrupt_) + return; + start_srd_session(); uint64_t sample_count; @@ -679,13 +715,13 @@ void DecodeSignal::decode_proc() decode_data(abs_start_samplenum, sample_count); abs_start_samplenum += sample_count; } - } while (error_message_.isEmpty() && (sample_count > 0)); + } while (error_message_.isEmpty() && (sample_count > 0) && !decode_interrupt_); - if (error_message_.isEmpty()) { - // Make sure all annotations are known to the frontend - new_annotations(); + if (error_message_.isEmpty() && !decode_interrupt_) { + if (sample_count == 0) + decode_finished(); - // Wait for new input data or an interrupt request + // Wait for new input data or an interrupt was requested unique_lock input_wait_lock(input_mutex_); decode_input_cond_.wait(input_wait_lock); } @@ -694,37 +730,38 @@ void DecodeSignal::decode_proc() void DecodeSignal::start_srd_session() { - if (!srd_session_) { - // Create the session - srd_session_new(&srd_session_); - assert(srd_session_); - - // Create the decoders - srd_decoder_inst *prev_di = nullptr; - for (const shared_ptr &dec : stack_) { - srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_); + if (srd_session_) + stop_srd_session(); - if (!di) { - error_message_ = tr("Failed to create decoder instance"); - srd_session_destroy(srd_session_); - return; - } + // Create the session + srd_session_new(&srd_session_); + assert(srd_session_); - if (prev_di) - srd_inst_stack(srd_session_, prev_di, di); + // Create the decoders + srd_decoder_inst *prev_di = nullptr; + for (const shared_ptr &dec : stack_) { + srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_); - prev_di = di; + if (!di) { + error_message_ = tr("Failed to create decoder instance"); + srd_session_destroy(srd_session_); + return; } - // Start the session - srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, - g_variant_new_uint64(samplerate_)); + if (prev_di) + srd_inst_stack(srd_session_, prev_di, di); - srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN, - DecodeSignal::annotation_callback, this); - - srd_session_start(srd_session_); + prev_di = di; } + + // Start the session + srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, + g_variant_new_uint64(samplerate_)); + + srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN, + DecodeSignal::annotation_callback, this); + + srd_session_start(srd_session_); } void DecodeSignal::stop_srd_session() @@ -736,6 +773,25 @@ 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 (data::DecodeChannel &ch : channels_) { + if (!ch.assigned_signal) + continue; + + const data::SignalBase *signal = ch.assigned_signal; + connect(signal, SIGNAL(samples_cleared()), + this, SLOT(on_data_cleared())); + connect(signal, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), + this, SLOT(on_data_received())); + } +} + void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal) { assert(pdata); @@ -775,10 +831,6 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa // Add the annotation (*row_iter).second.push_annotation(a); - - // Notify the frontend every DecodeNotifyPeriod annotations - if (ds->inc_annotation_count() % DecodeNotifyPeriod == 0) - ds->new_annotations(); } void DecodeSignal::on_capture_state_changed(int state) @@ -788,14 +840,17 @@ void DecodeSignal::on_capture_state_changed(int state) begin_decode(); } -void DecodeSignal::on_data_received() +void DecodeSignal::on_data_cleared() { - logic_mux_cond_.notify_one(); + reset_decode(); } -void DecodeSignal::on_frame_ended() +void DecodeSignal::on_data_received() { - logic_mux_cond_.notify_one(); + if (!logic_mux_thread_.joinable()) + begin_decode(); + else + logic_mux_cond_.notify_one(); } } // namespace data