X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=256c29b8c9f34d65d090ab8a77ca1e4d563d32f3;hp=a6d4a9d603b23e0820a9a6a869658020e7787079;hb=144e72c9ec677e7df35d37d7de6e8a18bb3f2ba1;hpb=ed75426f60765fe965d8bfdd21eb904cccc92804 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index a6d4a9d6..256c29b8 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -33,18 +33,14 @@ #include #include -using std::forward_list; using std::lock_guard; -using std::make_pair; using std::make_shared; using std::min; using std::out_of_range; using std::shared_ptr; using std::unique_lock; -using pv::data::decode::Annotation; +using pv::data::decode::AnnotationClass; using pv::data::decode::DecodeChannel; -using pv::data::decode::Decoder; -using pv::data::decode::Row; namespace pv { namespace data { @@ -60,7 +56,8 @@ DecodeSignal::DecodeSignal(pv::Session &session) : srd_session_(nullptr), logic_mux_data_invalid_(false), stack_config_changed_(true), - current_segment_id_(0) + current_segment_id_(0), + error_message_("") { connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int))); @@ -81,17 +78,18 @@ void DecodeSignal::stack_decoder(const srd_decoder *decoder, bool restart_decode assert(decoder); // Set name if this decoder is the first in the list or the name is unchanged - const srd_decoder* prev_dec = - stack_.empty() ? nullptr : stack_.back()->decoder(); - const QString prev_dec_name = - prev_dec ? QString::fromUtf8(prev_dec->name) : QString(); + const srd_decoder* prev_dec = stack_.empty() ? nullptr : stack_.back()->get_srd_decoder(); + const QString prev_dec_name = prev_dec ? QString::fromUtf8(prev_dec->name) : QString(); if ((stack_.empty()) || ((stack_.size() > 0) && (name() == prev_dec_name))) set_name(QString::fromUtf8(decoder->name)); - const shared_ptr dec = make_shared(decoder); + const shared_ptr dec = make_shared(decoder, stack_.size()); stack_.push_back(dec); + connect(dec.get(), SIGNAL(annotation_visibility_changed()), + this, SLOT(on_annotation_visibility_changed())); + // Include the newly created decode channels in the channel lists update_channel_list(); @@ -111,11 +109,12 @@ void DecodeSignal::remove_decoder(int index) assert(index < (int)stack_.size()); // Find the decoder in the stack - auto iter = stack_.begin(); - for (int i = 0; i < index; i++, iter++) - assert(iter != stack_.end()); + auto iter = stack_.begin() + index; + assert(iter != stack_.end()); - decoder_removed(iter->get()); + shared_ptr dec = *iter; + + decoder_removed(dec.get()); // Delete the element stack_.erase(iter); @@ -137,8 +136,8 @@ bool DecodeSignal::toggle_decoder_visibility(int index) // Toggle decoder visibility bool state = false; if (dec) { - state = !dec->shown(); - dec->show(state); + state = !dec->visible(); + dec->set_visible(state); } return state; @@ -146,6 +145,8 @@ bool DecodeSignal::toggle_decoder_visibility(int index) void DecodeSignal::reset_decode(bool shutting_down) { + resume_decode(); // Make sure the decode thread isn't blocked by pausing + if (stack_config_changed_ || shutting_down) stop_srd_session(); else @@ -163,9 +164,6 @@ void DecodeSignal::reset_decode(bool shutting_down) logic_mux_thread_.join(); } - resume_decode(); // Make sure the decode thread isn't blocked by pausing - - class_rows_.clear(); current_segment_id_ = 0; segments_.clear(); @@ -217,34 +215,13 @@ void DecodeSignal::begin_decode() ch.assigned_signal = nullptr; // Check that all decoders have the required channels - for (const shared_ptr& dec : stack_) + for (const shared_ptr& dec : stack_) if (!dec->have_required_channels()) { set_error_message(tr("One or more required channels " "have not been specified")); return; } - // Map out all the annotation classes - int row_index = 0; - for (const shared_ptr& dec : stack_) { - assert(dec); - const srd_decoder *const decc = dec->decoder(); - assert(dec->decoder()); - - for (const GSList *l = decc->annotation_rows; l; l = l->next) { - const srd_decoder_annotation_row *const ann_row = - (srd_decoder_annotation_row *)l->data; - assert(ann_row); - - const Row row(row_index++, decc, ann_row); - - for (const GSList *ll = ann_row->ann_classes; - ll; ll = ll->next) - class_rows_[make_pair(decc, - GPOINTER_TO_INT(ll->data))] = row; - } - } - // Free the logic data and its segment(s) if it needs to be updated if (logic_mux_data_invalid_) logic_mux_data_.reset(); @@ -258,10 +235,8 @@ void DecodeSignal::begin_decode() // Receive notifications when new sample data is available connect_input_notifiers(); - if (get_input_segment_count() == 0) { + if (get_input_segment_count() == 0) set_error_message(tr("No input data")); - return; - } // Make sure the logic output data is complete and up-to-date logic_mux_interrupt_ = false; @@ -386,7 +361,7 @@ void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int in begin_decode(); } -double DecodeSignal::samplerate() const +double DecodeSignal::get_samplerate() const { double result = 0; @@ -419,18 +394,20 @@ int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const for (const decode::DecodeChannel& ch : channels_) if (ch.assigned_signal) { + if (!ch.assigned_signal->logic_data()) + return 0; + no_signals_assigned = false; const shared_ptr logic_data = ch.assigned_signal->logic_data(); - if (!logic_data || logic_data->logic_segments().empty()) + if (logic_data->logic_segments().empty()) return 0; - try { - const shared_ptr segment = logic_data->logic_segments().at(segment_id); - count = min(count, (int64_t)segment->get_sample_count()); - } catch (out_of_range&) { + if (segment_id >= logic_data->logic_segments().size()) return 0; - } + + const shared_ptr segment = logic_data->logic_segments()[segment_id]; + count = min(count, (int64_t)segment->get_sample_count()); } return (no_signals_assigned ? 0 : count); @@ -454,98 +431,97 @@ int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id, return result; } -vector DecodeSignal::get_rows(bool visible_only) const +vector DecodeSignal::get_rows(bool visible_only) { - lock_guard lock(output_mutex_); - - vector rows; + vector rows; - for (const shared_ptr& dec : stack_) { + for (const shared_ptr& dec : stack_) { assert(dec); - if (visible_only && !dec->shown()) + if (visible_only && !dec->visible()) continue; - const srd_decoder *const decc = dec->decoder(); - assert(dec->decoder()); + for (Row* row : dec->get_rows()) + rows.push_back(row); + } - int row_index = 0; - // Add a row for the decoder if it doesn't have a row list - if (!decc->annotation_rows) - rows.emplace_back(row_index++, decc); + return rows; +} - // Add the decoder rows - for (const GSList *l = decc->annotation_rows; l; l = l->next) { - const srd_decoder_annotation_row *const ann_row = - (srd_decoder_annotation_row *)l->data; - assert(ann_row); - rows.emplace_back(row_index++, decc, ann_row); - } +vector DecodeSignal::get_rows(bool visible_only) const +{ + vector rows; + + for (const shared_ptr& dec : stack_) { + assert(dec); + if (visible_only && !dec->visible()) + continue; + + for (const Row* row : dec->get_rows()) + rows.push_back(row); } return rows; } -void DecodeSignal::get_annotation_subset( - vector &dest, - const decode::Row &row, uint32_t segment_id, uint64_t start_sample, - uint64_t end_sample) const -{ - lock_guard lock(output_mutex_); +uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id) const +{ if (segment_id >= segments_.size()) - return; + return 0; + + const DecodeSegment* segment = &(segments_.at(segment_id)); + + auto row_it = segment->annotation_rows.find(row); - const DecodeSegment *segment = &(segments_.at(segment_id)); - const map *rows = - &(segment->annotation_rows); + const RowData* rd; + if (row_it == segment->annotation_rows.end()) + return 0; + else + rd = &(row_it->second); - const auto iter = rows->find(row); - if (iter != rows->end()) - (*iter).second.get_annotation_subset(dest, start_sample, end_sample); + return rd->get_annotation_count(); } -void DecodeSignal::get_annotation_subset( - vector &dest, - uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const +void DecodeSignal::get_annotation_subset(deque &dest, + const Row* row, uint32_t segment_id, uint64_t start_sample, + uint64_t end_sample) const { - // Note: We put all vectors and lists on the heap, not the stack + lock_guard lock(output_mutex_); - const vector rows = get_rows(true); + if (segment_id >= segments_.size()) + return; - // Use forward_lists for faster merging - forward_list *all_ann_list = new forward_list(); + const DecodeSegment* segment = &(segments_.at(segment_id)); - for (const Row& row : rows) { - vector *ann_vector = new vector(); - get_annotation_subset(*ann_vector, row, segment_id, start_sample, end_sample); + auto row_it = segment->annotation_rows.find(row); - forward_list *ann_list = - new forward_list(ann_vector->begin(), ann_vector->end()); - delete ann_vector; + const RowData* rd; + if (row_it == segment->annotation_rows.end()) + return; + else + rd = &(row_it->second); - all_ann_list->merge(*ann_list); - delete ann_list; - } + rd->get_annotation_subset(dest, start_sample, end_sample); +} - move(all_ann_list->begin(), all_ann_list->end(), back_inserter(dest)); - delete all_ann_list; +void DecodeSignal::get_annotation_subset(deque &dest, + uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const +{ + for (const Row* row : get_rows()) + get_annotation_subset(dest, row, segment_id, start_sample, end_sample); } uint32_t DecodeSignal::get_binary_data_chunk_count(uint32_t segment_id, const Decoder* dec, uint32_t bin_class_id) const { - if (segments_.size() == 0) + if ((segments_.size() == 0) || (segment_id >= segments_.size())) return 0; - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); + const DecodeSegment *segment = &(segments_[segment_id]); - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) - return bc.chunks.size(); - } catch (out_of_range&) { - // Do nothing - } + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) + return bc.chunks.size(); return 0; } @@ -554,18 +530,17 @@ void DecodeSignal::get_binary_data_chunk(uint32_t segment_id, const Decoder* dec, uint32_t bin_class_id, uint32_t chunk_id, const vector **dest, uint64_t *size) { - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); + if (segment_id >= segments_.size()) + return; - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) { - if (dest) *dest = &(bc.chunks.at(chunk_id).data); - if (size) *size = bc.chunks.at(chunk_id).data.size(); - return; - } - } catch (out_of_range&) { - // Do nothing - } + const DecodeSegment *segment = &(segments_[segment_id]); + + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) { + if (dest) *dest = &(bc.chunks.at(chunk_id).data); + if (size) *size = bc.chunks.at(chunk_id).data.size(); + return; + } } void DecodeSignal::get_merged_binary_data_chunks_by_sample(uint32_t segment_id, @@ -574,99 +549,107 @@ void DecodeSignal::get_merged_binary_data_chunks_by_sample(uint32_t segment_id, { assert(dest != nullptr); - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); - - const DecodeBinaryClass* bin_class = nullptr; - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) - bin_class = &bc; - - // Determine overall size before copying to resize dest vector only once - uint64_t size = 0; - uint64_t matches = 0; - for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) - if ((chunk.sample >= start_sample) && (chunk.sample < end_sample)) { - size += chunk.data.size(); - matches++; - } - dest->resize(size); - - uint64_t offset = 0; - uint64_t matches2 = 0; - for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) - if ((chunk.sample >= start_sample) && (chunk.sample < end_sample)) { - memcpy(dest->data() + offset, chunk.data.data(), chunk.data.size()); - offset += chunk.data.size(); - matches2++; - - // Make sure we don't overwrite memory if the array grew in the meanwhile - if (matches2 == matches) - break; - } - } catch (out_of_range&) { - // Do nothing - } + if (segment_id >= segments_.size()) + return; + + const DecodeSegment *segment = &(segments_[segment_id]); + + const DecodeBinaryClass* bin_class = nullptr; + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) + bin_class = &bc; + + // Determine overall size before copying to resize dest vector only once + uint64_t size = 0; + uint64_t matches = 0; + for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) + if ((chunk.sample >= start_sample) && (chunk.sample < end_sample)) { + size += chunk.data.size(); + matches++; + } + dest->resize(size); + + uint64_t offset = 0; + uint64_t matches2 = 0; + for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) + if ((chunk.sample >= start_sample) && (chunk.sample < end_sample)) { + memcpy(dest->data() + offset, chunk.data.data(), chunk.data.size()); + offset += chunk.data.size(); + matches2++; + + // Make sure we don't overwrite memory if the array grew in the meanwhile + if (matches2 == matches) + break; + } } void DecodeSignal::get_merged_binary_data_chunks_by_offset(uint32_t segment_id, - const data::decode::Decoder* dec, uint32_t bin_class_id, uint64_t start, - uint64_t end, vector *dest) const + const Decoder* dec, uint32_t bin_class_id, uint64_t start, uint64_t end, + vector *dest) const { assert(dest != nullptr); - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); - - const DecodeBinaryClass* bin_class = nullptr; - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) - bin_class = &bc; - - // Determine overall size before copying to resize dest vector only once - uint64_t size = 0; - uint64_t offset = 0; - for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) { - if (offset >= start) - size += chunk.data.size(); - offset += chunk.data.size(); - if (offset >= end) - break; - } - dest->resize(size); - - offset = 0; - uint64_t dest_offset = 0; - for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) { - if (offset >= start) { - memcpy(dest->data() + dest_offset, chunk.data.data(), chunk.data.size()); - dest_offset += chunk.data.size(); - } - offset += chunk.data.size(); - if (offset >= end) - break; + if (segment_id >= segments_.size()) + return; + + const DecodeSegment *segment = &(segments_[segment_id]); + + const DecodeBinaryClass* bin_class = nullptr; + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) + bin_class = &bc; + + // Determine overall size before copying to resize dest vector only once + uint64_t size = 0; + uint64_t offset = 0; + for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) { + if (offset >= start) + size += chunk.data.size(); + offset += chunk.data.size(); + if (offset >= end) + break; + } + dest->resize(size); + + offset = 0; + uint64_t dest_offset = 0; + for (const DecodeBinaryDataChunk& chunk : bin_class->chunks) { + if (offset >= start) { + memcpy(dest->data() + dest_offset, chunk.data.data(), chunk.data.size()); + dest_offset += chunk.data.size(); } - } catch (out_of_range&) { - // Do nothing + offset += chunk.data.size(); + if (offset >= end) + break; } } const DecodeBinaryClass* DecodeSignal::get_binary_data_class(uint32_t segment_id, - const data::decode::Decoder* dec, uint32_t bin_class_id) const + const Decoder* dec, uint32_t bin_class_id) const { - try { - const DecodeSegment *segment = &(segments_.at(segment_id)); + if (segment_id >= segments_.size()) + return nullptr; - for (const DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) - return &bc; - } catch (out_of_range&) { - // Do nothing - } + const DecodeSegment *segment = &(segments_[segment_id]); + + for (const DecodeBinaryClass& bc : segment->binary_classes) + if ((bc.decoder == dec) && (bc.info->bin_class_id == bin_class_id)) + return &bc; return nullptr; } +const deque* DecodeSignal::get_all_annotations_by_segment( + uint32_t segment_id) const +{ + if (segment_id >= segments_.size()) + return nullptr; + + const DecodeSegment *segment = &(segments_[segment_id]); + + return &(segment->all_annotations); +} + void DecodeSignal::save_settings(QSettings &settings) const { SignalBase::save_settings(settings); @@ -675,18 +658,18 @@ void DecodeSignal::save_settings(QSettings &settings) const // Save decoder stack int decoder_idx = 0; - for (const shared_ptr& decoder : stack_) { + for (const shared_ptr& decoder : stack_) { settings.beginGroup("decoder" + QString::number(decoder_idx++)); - settings.setValue("id", decoder->decoder()->id); - settings.setValue("shown", decoder->shown()); + settings.setValue("id", decoder->get_srd_decoder()->id); + settings.setValue("visible", decoder->visible()); // Save decoder options const map& options = decoder->options(); settings.setValue("options", (int)options.size()); - // Note: decode::Decoder::options() returns only the options + // Note: Decoder::options() returns only the options // that differ from the default. See binding::Decoder::getter() int i = 0; for (auto& option : options) { @@ -697,6 +680,24 @@ void DecodeSignal::save_settings(QSettings &settings) const i++; } + // Save row properties + i = 0; + for (const Row* row : decoder->get_rows()) { + settings.beginGroup("row" + QString::number(i)); + settings.setValue("visible", row->visible()); + settings.endGroup(); + i++; + } + + // Save class properties + i = 0; + for (const AnnotationClass* ann_class : decoder->ann_classes()) { + settings.beginGroup("ann_class" + QString::number(i)); + settings.setValue("visible", ann_class->visible()); + settings.endGroup(); + i++; + } + settings.endGroup(); } @@ -744,11 +745,13 @@ void DecodeSignal::restore_settings(QSettings &settings) continue; if (QString::fromUtf8(dec->id) == id) { - shared_ptr decoder = - make_shared(dec); + shared_ptr decoder = make_shared(dec, stack_.size()); + + connect(decoder.get(), SIGNAL(annotation_visibility_changed()), + this, SLOT(on_annotation_visibility_changed())); stack_.push_back(decoder); - decoder->show(settings.value("shown", true).toBool()); + decoder->set_visible(settings.value("visible", true).toBool()); // Restore decoder options that differ from their default int options = settings.value("options").toInt(); @@ -763,6 +766,25 @@ void DecodeSignal::restore_settings(QSettings &settings) // Include the newly created decode channels in the channel lists update_channel_list(); + + // Restore row properties + int i = 0; + for (Row* row : decoder->get_rows()) { + settings.beginGroup("row" + QString::number(i)); + row->set_visible(settings.value("visible", true).toBool()); + settings.endGroup(); + i++; + } + + // Restore class properties + i = 0; + for (AnnotationClass* ann_class : decoder->ann_classes()) { + settings.beginGroup("ann_class" + QString::number(i)); + ann_class->set_visible(settings.value("visible", true).toBool()); + settings.endGroup(); + i++; + } + break; } } @@ -774,7 +796,7 @@ void DecodeSignal::restore_settings(QSettings &settings) // Restore channel mapping unsigned int channels = settings.value("channels").toInt(); - const unordered_set< shared_ptr > signalbases = + const vector< shared_ptr > signalbases = session_.signalbases(); for (unsigned int channel_id = 0; channel_id < channels; channel_id++) { @@ -791,7 +813,7 @@ void DecodeSignal::restore_settings(QSettings &settings) QString assigned_signal_name = settings.value("assigned_signal_name").toString(); for (const shared_ptr& signal : signalbases) - if (signal->name() == assigned_signal_name) + if ((signal->name() == assigned_signal_name) && (signal->type() != SignalBase::DecodeChannel)) channel->assigned_signal = signal.get(); channel->initial_pin_state = settings.value("initial_pin_state").toInt(); @@ -814,6 +836,30 @@ void DecodeSignal::set_error_message(QString msg) qDebug().nospace() << name() << ": " << msg; } +bool DecodeSignal::all_input_segments_complete(uint32_t segment_id) const +{ + bool all_complete = true; + + for (const decode::DecodeChannel& ch : channels_) + if (ch.assigned_signal) { + if (!ch.assigned_signal->logic_data()) + continue; + + const shared_ptr logic_data = ch.assigned_signal->logic_data(); + if (logic_data->logic_segments().empty()) + return false; + + if (segment_id >= logic_data->logic_segments().size()) + return false; + + const shared_ptr segment = logic_data->logic_segments()[segment_id]; + if (!segment->is_complete()) + all_complete = false; + } + + return all_complete; +} + uint32_t DecodeSignal::get_input_segment_count() const { uint64_t count = std::numeric_limits::max(); @@ -835,7 +881,7 @@ uint32_t DecodeSignal::get_input_segment_count() const return (no_signals_assigned ? 0 : count); } -uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const +double DecodeSignal::get_input_samplerate(uint32_t segment_id) const { double samplerate = 0; @@ -857,6 +903,15 @@ uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const return samplerate; } +Decoder* DecodeSignal::get_decoder_by_instance(const srd_decoder *const srd_dec) +{ + for (shared_ptr& d : stack_) + if (d->get_srd_decoder() == srd_dec) + return d.get(); + + return nullptr; +} + void DecodeSignal::update_channel_list() { vector prev_channels = channels_; @@ -866,11 +921,11 @@ void DecodeSignal::update_channel_list() // Copy existing entries, create new as needed for (shared_ptr& decoder : stack_) { - const srd_decoder* srd_d = decoder->decoder(); + const srd_decoder* srd_dec = decoder->get_srd_decoder(); const GSList *l; // Mandatory channels - for (l = srd_d->channels; l; l = l->next) { + for (l = srd_dec->channels; l; l = l->next) { const struct srd_channel *const pdch = (struct srd_channel *)l->data; bool ch_added = false; @@ -893,7 +948,7 @@ void DecodeSignal::update_channel_list() } // Optional channels - for (l = srd_d->opt_channels; l; l = l->next) { + for (l = srd_dec->opt_channels; l; l = l->next) { const struct srd_channel *const pdch = (struct srd_channel *)l->data; bool ch_added = false; @@ -941,7 +996,7 @@ void DecodeSignal::update_channel_list() void DecodeSignal::commit_decoder_channels() { // Submit channel list to every decoder, containing only the relevant channels - for (shared_ptr dec : stack_) { + for (shared_ptr dec : stack_) { vector channel_list; for (decode::DecodeChannel& ch : channels_) @@ -1044,10 +1099,23 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c void DecodeSignal::logic_mux_proc() { - uint32_t segment_id = 0; + uint32_t input_segment_count; + do { + input_segment_count = get_input_segment_count(); + if (input_segment_count == 0) { + // Wait for input data + unique_lock logic_mux_lock(logic_mux_mutex_); + logic_mux_cond_.wait(logic_mux_lock); + } + } while ((!logic_mux_interrupt_) && (input_segment_count == 0)); + + if (logic_mux_interrupt_) + return; assert(logic_mux_data_); + uint32_t segment_id = 0; + // Create initial logic mux segment shared_ptr output_segment = make_shared(*logic_mux_data_, segment_id, @@ -1056,57 +1124,63 @@ void DecodeSignal::logic_mux_proc() output_segment->set_samplerate(get_input_samplerate(0)); + // Logic mux data is being updated + logic_mux_data_invalid_ = false; + + uint64_t samples_to_process; do { - const uint64_t input_sample_count = get_working_sample_count(segment_id); - const uint64_t output_sample_count = output_segment->get_sample_count(); + do { + const uint64_t input_sample_count = get_working_sample_count(segment_id); + const uint64_t output_sample_count = output_segment->get_sample_count(); - const uint64_t samples_to_process = - (input_sample_count > output_sample_count) ? - (input_sample_count - output_sample_count) : 0; + samples_to_process = + (input_sample_count > output_sample_count) ? + (input_sample_count - output_sample_count) : 0; - // Process the samples if necessary... - if (samples_to_process > 0) { - const uint64_t unit_size = output_segment->unit_size(); - const uint64_t chunk_sample_count = DecodeChunkLength / unit_size; + if (samples_to_process > 0) { + const uint64_t unit_size = output_segment->unit_size(); + const uint64_t chunk_sample_count = DecodeChunkLength / unit_size; - uint64_t processed_samples = 0; - do { - const uint64_t start_sample = output_sample_count + processed_samples; - const uint64_t sample_count = - min(samples_to_process - processed_samples, chunk_sample_count); + uint64_t processed_samples = 0; + do { + const uint64_t start_sample = output_sample_count + processed_samples; + const uint64_t sample_count = + min(samples_to_process - processed_samples, chunk_sample_count); - mux_logic_samples(segment_id, start_sample, start_sample + sample_count); - processed_samples += sample_count; + mux_logic_samples(segment_id, start_sample, start_sample + sample_count); + processed_samples += sample_count; - // ...and process the newly muxed logic data - decode_input_cond_.notify_one(); - } while (!logic_mux_interrupt_ && (processed_samples < samples_to_process)); - } + // ...and process the newly muxed logic data + decode_input_cond_.notify_one(); + } while (!logic_mux_interrupt_ && (processed_samples < samples_to_process)); + } + } while (!logic_mux_interrupt_ && (samples_to_process > 0)); - if (samples_to_process == 0) { - // TODO Optimize this by caching the input segment count and only - // querying it when the cached value was reached - if (segment_id < get_input_segment_count() - 1) { - // Process next segment - segment_id++; + if (!logic_mux_interrupt_) { + // samples_to_process is now 0, we've exhausted the currently available input data - output_segment = - make_shared(*logic_mux_data_, segment_id, - logic_mux_unit_size_, 0); - logic_mux_data_->push_segment(output_segment); + // If the input segments are complete, we've completed this segment + if (all_input_segments_complete(segment_id)) { + if (!output_segment->is_complete()) + output_segment->set_complete(); - output_segment->set_samplerate(get_input_samplerate(segment_id)); + if (segment_id < get_input_segment_count() - 1) { + // Process next segment + segment_id++; - } else { - // All segments have been processed - logic_mux_data_invalid_ = false; + output_segment = + make_shared(*logic_mux_data_, segment_id, + logic_mux_unit_size_, 0); + logic_mux_data_->push_segment(output_segment); + output_segment->set_samplerate(get_input_samplerate(segment_id)); + } + } else { // Wait for more input unique_lock logic_mux_lock(logic_mux_mutex_); logic_mux_cond_.wait(logic_mux_lock); } } - } while (!logic_mux_interrupt_); } @@ -1136,8 +1210,10 @@ void DecodeSignal::decode_data( input_segment->get_samples(i, chunk_end, chunk); if (srd_session_send(srd_session_, i, chunk_end, chunk, - data_size, unit_size) != SRD_OK) + data_size, unit_size) != SRD_OK) { set_error_message(tr("Decoder reported an error")); + decode_interrupt_ = true; + } delete[] chunk; @@ -1163,10 +1239,13 @@ void DecodeSignal::decode_proc() current_segment_id_ = 0; // If there is no input data available yet, wait until it is or we're interrupted - if (logic_mux_data_->logic_segments().size() == 0) { - unique_lock input_wait_lock(input_mutex_); - decode_input_cond_.wait(input_wait_lock); - } + do { + if (logic_mux_data_->logic_segments().size() == 0) { + // Wait for input data + unique_lock input_wait_lock(input_mutex_); + decode_input_cond_.wait(input_wait_lock); + } + } while ((!decode_interrupt_) && (logic_mux_data_->logic_segments().size() == 0)); if (decode_interrupt_) return; @@ -1181,52 +1260,57 @@ void DecodeSignal::decode_proc() start_srd_session(); - uint64_t sample_count = 0; + uint64_t samples_to_process = 0; uint64_t abs_start_samplenum = 0; do { // Keep processing new samples until we exhaust the input data do { - lock_guard input_lock(input_mutex_); - sample_count = input_segment->get_sample_count() - abs_start_samplenum; + samples_to_process = input_segment->get_sample_count() - abs_start_samplenum; - if (sample_count > 0) { - decode_data(abs_start_samplenum, sample_count, input_segment); - abs_start_samplenum += sample_count; + if (samples_to_process > 0) { + decode_data(abs_start_samplenum, samples_to_process, input_segment); + abs_start_samplenum += samples_to_process; } - } while (error_message_.isEmpty() && (sample_count > 0) && !decode_interrupt_); - - if (error_message_.isEmpty() && !decode_interrupt_ && sample_count == 0) { - if (current_segment_id_ < logic_mux_data_->logic_segments().size() - 1) { - // Process next segment - current_segment_id_++; - - try { - input_segment = logic_mux_data_->logic_segments().at(current_segment_id_); - } catch (out_of_range&) { - qDebug() << "Decode error for" << name() << ": no logic mux segment" \ - << current_segment_id_ << "in decode_proc(), mux segments size is" \ - << logic_mux_data_->logic_segments().size(); - return; + } while (!decode_interrupt_ && (samples_to_process > 0)); + + if (!decode_interrupt_) { + // samples_to_process is now 0, we've exhausted the currently available input data + + // 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) { + // Process next segment + current_segment_id_++; + + try { + input_segment = logic_mux_data_->logic_segments().at(current_segment_id_); + } catch (out_of_range&) { + qDebug() << "Decode error for" << name() << ": no logic mux segment" \ + << current_segment_id_ << "in decode_proc(), mux segments size is" \ + << logic_mux_data_->logic_segments().size(); + decode_interrupt_ = true; + return; + } + abs_start_samplenum = 0; + + // Create the next segment and set its metadata + create_decode_segment(); + segments_.at(current_segment_id_).samplerate = input_segment->samplerate(); + segments_.at(current_segment_id_).start_time = input_segment->start_time(); + + // Reset decoder state but keep the decoder stack intact + terminate_srd_session(); + } else { + // All segments have been processed + decode_finished(); } - abs_start_samplenum = 0; - - // Create the next segment and set its metadata - create_decode_segment(); - segments_.at(current_segment_id_).samplerate = input_segment->samplerate(); - segments_.at(current_segment_id_).start_time = input_segment->start_time(); - - // Reset decoder state but keep the decoder stack intact - terminate_srd_session(); } else { - // All segments have been processed - decode_finished(); - - // Wait for new input data or an interrupt was requested + // Wait for more input data unique_lock input_wait_lock(input_mutex_); decode_input_cond_.wait(input_wait_lock); } } - } while (error_message_.isEmpty() && !decode_interrupt_); + } while (!decode_interrupt_); // Potentially reap decoders when the application no longer is // interested in their (pending) results. @@ -1256,7 +1340,7 @@ void DecodeSignal::start_srd_session() if (samplerate) srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, g_variant_new_uint64(samplerate)); - for (const shared_ptr& dec : stack_) + for (const shared_ptr& dec : stack_) dec->apply_all_options(); srd_session_start(srd_session_); @@ -1269,7 +1353,7 @@ void DecodeSignal::start_srd_session() // Create the decoders srd_decoder_inst *prev_di = nullptr; - for (const shared_ptr& dec : stack_) { + for (const shared_ptr& dec : stack_) { srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_); if (!di) { @@ -1319,7 +1403,7 @@ void DecodeSignal::terminate_srd_session() if (samplerate) srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, g_variant_new_uint64(samplerate)); - for (const shared_ptr& dec : stack_) + for (const shared_ptr& dec : stack_) dec->apply_all_options(); } } @@ -1332,7 +1416,7 @@ void DecodeSignal::stop_srd_session() srd_session_ = nullptr; // Mark the decoder instances as non-existant since they were deleted - for (const shared_ptr& dec : stack_) + for (const shared_ptr& dec : stack_) dec->invalidate_decoder_inst(); } } @@ -1349,46 +1433,25 @@ void DecodeSignal::connect_input_notifiers() continue; const data::SignalBase *signal = ch.assigned_signal; - 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())); + connect(signal, &data::SignalBase::samples_cleared, + this, &DecodeSignal::on_data_cleared); + connect(signal, &data::SignalBase::samples_added, + this, &DecodeSignal::on_data_received); } } void DecodeSignal::create_decode_segment() { // Create annotation segment - segments_.emplace_back(DecodeSegment()); + segments_.emplace_back(); // Add annotation classes - for (const shared_ptr& dec : stack_) { - assert(dec); - const srd_decoder *const decc = dec->decoder(); - assert(dec->decoder()); - - int row_index = 0; - // Add a row for the decoder if it doesn't have a row list - if (!decc->annotation_rows) - (segments_.back().annotation_rows)[Row(row_index++, decc)] = - decode::RowData(); - - // Add the decoder rows - for (const GSList *l = decc->annotation_rows; l; l = l->next) { - const srd_decoder_annotation_row *const ann_row = - (srd_decoder_annotation_row *)l->data; - assert(ann_row); - - const Row row(row_index++, decc, ann_row); - - // Add a new empty row data object - (segments_.back().annotation_rows)[row] = - decode::RowData(); - } - } + for (const shared_ptr& dec : stack_) + for (Row* row : dec->get_rows()) + segments_.back().annotation_rows.emplace(row, RowData(row)); // Prepare our binary output classes - for (const shared_ptr& dec : stack_) { + for (const shared_ptr& dec : stack_) { uint32_t n = dec->get_binary_class_count(); for (uint32_t i = 0; i < n; i++) @@ -1408,39 +1471,98 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa if (ds->decode_interrupt_) return; + if (ds->segments_.empty()) + return; + lock_guard lock(ds->output_mutex_); // Get the decoder and the annotation data assert(pdata->pdo); assert(pdata->pdo->di); - const srd_decoder *const decc = pdata->pdo->di->decoder; - assert(decc); + const srd_decoder *const srd_dec = pdata->pdo->di->decoder; + assert(srd_dec); const srd_proto_data_annotation *const pda = (const srd_proto_data_annotation*)pdata->data; assert(pda); // Find the row - auto row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.end(); - - // Try finding a better row match than the default by looking up the sub-row of this class - const auto format = pda->ann_class; - const auto r = ds->class_rows_.find(make_pair(decc, format)); - if (r != ds->class_rows_.end()) - row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find((*r).second); - else { - // Failing that, use the decoder as a key - row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find(Row(0, decc)); + Decoder* dec = ds->get_decoder_by_instance(srd_dec); + assert(dec); + + AnnotationClass* ann_class = dec->get_ann_class_by_id(pda->ann_class); + if (!ann_class) { + qWarning() << "Decoder" << ds->display_name() << "wanted to add annotation" << + "with class ID" << pda->ann_class << "but there are only" << + dec->ann_classes().size() << "known classes"; + return; } - if (row_iter == ds->segments_.at(ds->current_segment_id_).annotation_rows.end()) { - qDebug() << "Unexpected annotation: decoder = " << decc << - ", format = " << format; - assert(false); - return; + const Row* row = ann_class->row; + + if (!row) + row = dec->get_row_by_id(0); + + RowData& row_data = ds->segments_[ds->current_segment_id_].annotation_rows.at(row); + + // Add the annotation to the row + const Annotation* ann = row_data.emplace_annotation(pdata); + + // We insert the annotation into the global annotation list in a way so that + // the annotation list is sorted by start sample and length. Otherwise, we'd + // have to sort the model, which is expensive + deque& all_annotations = + ds->segments_[ds->current_segment_id_].all_annotations; + + if (all_annotations.empty()) { + all_annotations.emplace_back(ann); + } else { + const uint64_t new_ann_len = (pdata->end_sample - pdata->start_sample); + bool ann_has_earlier_start = (pdata->start_sample < all_annotations.back()->start_sample()); + bool ann_is_longer = (new_ann_len > + (all_annotations.back()->end_sample() - all_annotations.back()->start_sample())); + + if (ann_has_earlier_start && ann_is_longer) { + bool ann_has_same_start; + auto it = all_annotations.end(); + + do { + it--; + ann_has_earlier_start = (pdata->start_sample < (*it)->start_sample()); + ann_has_same_start = (pdata->start_sample == (*it)->start_sample()); + ann_is_longer = (new_ann_len > (*it)->length()); + } while ((ann_has_earlier_start || (ann_has_same_start && ann_is_longer)) && (it != all_annotations.begin())); + + // Allow inserting at the front + if (it != all_annotations.begin()) + it++; + + all_annotations.emplace(it, ann); + } else + all_annotations.emplace_back(ann); } - // Add the annotation - (*row_iter).second.emplace_annotation(pdata, &((*row_iter).first)); + // When emplace_annotation() inserts instead of appends an annotation, + // the pointers in all_annotations that follow the inserted annotation and + // point to annotations for this row are off by one and must be updated + if (&(row_data.annotations().back()) != ann) { + // Search backwards until we find the annotation we just added + auto row_it = row_data.annotations().end(); + auto all_it = all_annotations.end(); + do { + all_it--; + if ((*all_it)->row_data() == &row_data) + row_it--; + } while (&(*row_it) != ann); + + // Update the annotation addresses for this row's annotations until the end + do { + if ((*all_it)->row_data() == &row_data) { + *all_it = &(*row_it); + row_it++; + } + all_it++; + } while (all_it != all_annotations.end()); + } } void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal) @@ -1457,8 +1579,8 @@ void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal) // Get the decoder and the binary data assert(pdata->pdo); assert(pdata->pdo->di); - const srd_decoder *const decc = pdata->pdo->di->decoder; - assert(decc); + const srd_decoder *const srd_dec = pdata->pdo->di->decoder; + assert(srd_dec); const srd_proto_data_binary *const pdb = (const srd_proto_data_binary*)pdata->data; assert(pdb); @@ -1468,7 +1590,8 @@ void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal) DecodeBinaryClass* bin_class = nullptr; for (DecodeBinaryClass& bc : segment->binary_classes) - if ((bc.decoder->decoder() == decc) && (bc.info->bin_class_id == (uint32_t)pdb->bin_class)) + if ((bc.decoder->get_srd_decoder() == srd_dec) && + (bc.info->bin_class_id == (uint32_t)pdb->bin_class)) bin_class = &bc; if (!bin_class) { @@ -1486,13 +1609,7 @@ void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal) chunk->data.resize(pdb->size); memcpy(chunk->data.data(), pdb->data, pdb->size); - // Find decoder class instance - Decoder* dec = nullptr; - for (const shared_ptr& d : ds->decoder_stack()) - if (d->decoder() == decc) { - dec = d.get(); - break; - } + Decoder* dec = ds->get_decoder_by_instance(srd_dec); ds->new_binary_data(ds->current_segment_id_, (void*)dec, pdb->bin_class); } @@ -1525,5 +1642,10 @@ void DecodeSignal::on_data_received() logic_mux_cond_.notify_one(); } +void DecodeSignal::on_annotation_visibility_changed() +{ + annotation_visibility_changed(); +} + } // namespace data } // namespace pv