X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=47a0c8c7f846365fa5c325ff60d0fc34448d0e6a;hb=72435789a077273d96260f0225f79171e679359e;hp=03ecc2efcc3a0bbb7fd42b90133514969952f7b3;hpb=4913560f88d24909bab12177d7194314df1c9892;p=pulseview.git diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 03ecc2e..47a0c8c 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -36,6 +36,7 @@ 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; @@ -55,10 +56,8 @@ DecodeSignal::DecodeSignal(pv::Session &session) : session_(session), srd_session_(nullptr), logic_mux_data_invalid_(false), - start_time_(0), - samplerate_(0), - samples_decoded_(0), - frame_complete_(false) + current_segment_id_(0), + current_segment_(nullptr) { connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int))); @@ -145,16 +144,17 @@ void DecodeSignal::reset_decode() stop_srd_session(); - frame_complete_ = false; - samples_decoded_ = 0; - error_message_ = QString(); - - rows_.clear(); - current_rows_= nullptr; class_rows_.clear(); + currently_processed_segment_ = 0; + current_segment_ = nullptr; + segments_.clear(); logic_mux_data_.reset(); logic_mux_data_invalid_ = true; + + error_message_ = QString(); + + decode_reset(); } void DecodeSignal::begin_decode() @@ -220,20 +220,18 @@ void DecodeSignal::begin_decode() } } - prepare_annotation_segment(); - // Free the logic data and its segment(s) if it needs to be updated if (logic_mux_data_invalid_) logic_mux_data_.reset(); if (!logic_mux_data_) { - const int64_t ch_count = get_assigned_signal_count(); - const int64_t unit_size = (ch_count + 7) / 8; + const uint32_t ch_count = get_assigned_signal_count(); + logic_unit_size_ = (ch_count + 7) / 8; logic_mux_data_ = make_shared(ch_count); - logic_mux_segment_ = make_shared(*logic_mux_data_, unit_size, samplerate_); - logic_mux_data_->push_segment(logic_mux_segment_); } + create_new_segment(); + // 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); @@ -322,23 +320,41 @@ void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int in double DecodeSignal::samplerate() const { - return samplerate_; + double result = 0; + + // TODO For now, we simply return the first samplerate that we have + try { + const DecodeSegment *segment = &(segments_.at(0)); + result = segment->samplerate; + } catch (out_of_range) { + // Do nothing + } + + return result; } -const pv::util::Timestamp& DecodeSignal::start_time() const +const pv::util::Timestamp DecodeSignal::start_time() const { - return start_time_; + pv::util::Timestamp result; + + // TODO For now, we simply return the first start time that we have + try { + const DecodeSegment *segment = &(segments_.at(0)); + result = segment->start_time; + } catch (out_of_range) { + // Do nothing + } + + return result; } -int64_t DecodeSignal::get_working_sample_count() const +int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const { // The working sample count is the highest sample number for // which all used signals have data available, so go through // all channels and use the lowest overall sample count of the // current segment - // TODO Currently, we assume only a single segment exists - int64_t count = std::numeric_limits::max(); bool no_signals_assigned = true; @@ -350,17 +366,31 @@ int64_t DecodeSignal::get_working_sample_count() const if (!logic_data || logic_data->logic_segments().empty()) return 0; - const shared_ptr segment = logic_data->logic_segments().front(); - count = min(count, (int64_t)segment->get_sample_count()); + 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) { + return 0; + } } return (no_signals_assigned ? 0 : count); } -int64_t DecodeSignal::get_decoded_sample_count() const +int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id) const { lock_guard decode_lock(output_mutex_); - return samples_decoded_; + + int64_t result = 0; + + try { + const DecodeSegment *segment = &(segments_.at(segment_id)); + result = segment->samples_decoded; + } catch (out_of_range) { + // Do nothing + } + + return result; } vector DecodeSignal::visible_rows() const @@ -395,20 +425,23 @@ vector DecodeSignal::visible_rows() const void DecodeSignal::get_annotation_subset( vector &dest, - const decode::Row &row, uint64_t start_sample, + const decode::Row &row, uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const { lock_guard lock(output_mutex_); - if (!current_rows_) - return; - - // TODO Instead of current_rows_, use rows_ and the ID of the segment - - const auto iter = current_rows_->find(row); - if (iter != current_rows_->end()) - (*iter).second.get_annotation_subset(dest, - start_sample, end_sample); + try { + const DecodeSegment *segment = &(segments_.at(segment_id)); + const map *rows = + &(segment->annotation_rows); + + const auto iter = rows->find(row); + if (iter != rows->end()) + (*iter).second.get_annotation_subset(dest, + start_sample, end_sample); + } catch (out_of_range) { + // Do nothing + } } void DecodeSignal::save_settings(QSettings &settings) const @@ -505,7 +538,6 @@ void DecodeSignal::restore_settings(QSettings &settings) // Include the newly created decode channels in the channel lists update_channel_list(); - commit_decoder_channels(); break; } } @@ -542,6 +574,10 @@ void DecodeSignal::restore_settings(QSettings &settings) settings.endGroup(); } + // Update the internal structures + update_channel_list(); + commit_decoder_channels(); + begin_decode(); } @@ -638,6 +674,12 @@ void DecodeSignal::commit_decoder_channels() dec->set_channels(channel_list); } + + // Channel bit IDs must be in sync with the channel's apperance in channels_ + int id = 0; + for (data::DecodeChannel &ch : channels_) + if (ch.assigned_signal) + ch.bit_id = id++; } void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) @@ -653,11 +695,8 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) vector signal_in_bytepos; vector signal_in_bitpos; - int id = 0; for (data::DecodeChannel &ch : channels_) if (ch.assigned_signal) { - ch.bit_id = id++; - const shared_ptr logic_data = ch.assigned_signal->logic_data(); const shared_ptr segment = logic_data->logic_segments().front(); segments.push_back(segment); @@ -710,7 +749,7 @@ 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 input_sample_count = get_working_sample_count(currently_processed_segment_); const uint64_t output_sample_count = logic_mux_segment_->get_sample_count(); const uint64_t samples_to_process = @@ -737,16 +776,13 @@ void DecodeSignal::logic_mux_proc() } if (samples_to_process == 0) { + logic_mux_data_invalid_ = false; + // Wait for more input unique_lock logic_mux_lock(logic_mux_mutex_); logic_mux_cond_.wait(logic_mux_lock); } } 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 - // in order to let other decoders run - decode_input_cond_.notify_one(); } void DecodeSignal::query_input_metadata() @@ -760,6 +796,8 @@ void DecodeSignal::query_input_metadata() data::DecodeChannel *any_channel; shared_ptr logic_data; + assert(current_segment_); + do { any_channel = &(*find_if(channels_.begin(), channels_.end(), [](data::DecodeChannel ch) { return ch.assigned_signal; })); @@ -780,9 +818,10 @@ void DecodeSignal::query_input_metadata() 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) + + current_segment_->start_time = first_segment->start_time(); + current_segment_->samplerate = first_segment->samplerate(); + if (current_segment_->samplerate > 0) samplerate_valid = true; } @@ -797,6 +836,8 @@ void DecodeSignal::query_input_metadata() void DecodeSignal::decode_data( const int64_t abs_start_samplenum, const int64_t sample_count) { + assert(current_segment_); + const int64_t unit_size = logic_mux_segment_->unit_size(); const int64_t chunk_sample_count = DecodeChunkLength / unit_size; @@ -822,7 +863,7 @@ void DecodeSignal::decode_data( { lock_guard lock(output_mutex_); - samples_decoded_ = chunk_end; + current_segment_->samples_decoded = chunk_end; } // Notify the frontend that we processed some data and @@ -870,6 +911,8 @@ void DecodeSignal::start_srd_session() if (srd_session_) stop_srd_session(); + assert(current_segment_); + // Create the session srd_session_new(&srd_session_); assert(srd_session_); @@ -893,7 +936,7 @@ void DecodeSignal::start_srd_session() // Start the session srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, - g_variant_new_uint64(samplerate_)); + g_variant_new_uint64(current_segment_->samplerate)); srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN, DecodeSignal::annotation_callback, this); @@ -929,11 +972,24 @@ void DecodeSignal::connect_input_notifiers() } } -void DecodeSignal::prepare_annotation_segment() +void DecodeSignal::create_new_segment() { - // TODO Won't work for multiple segments - rows_.emplace_back(map()); - current_rows_ = &(rows_.back()); + // Create logic mux segment if we're recreating the muxed data + if (logic_mux_data_invalid_) { + const double samplerate = + (current_segment_) ? current_segment_->samplerate : 0; + + logic_mux_segment_ = make_shared(*logic_mux_data_, + logic_unit_size_, samplerate); + logic_mux_data_->push_segment(logic_mux_segment_); + } + + // Create annotation segment + segments_.emplace_back(DecodeSegment()); + current_segment_ = &(segments_.back()); + + // TODO Currently we assume there's only one sample rate + current_segment_->samplerate = segments_.front().samplerate; // Add annotation classes for (const shared_ptr &dec : stack_) { @@ -943,7 +999,7 @@ void DecodeSignal::prepare_annotation_segment() // Add a row for the decoder if it doesn't have a row list if (!decc->annotation_rows) - (*current_rows_)[Row(decc)] = decode::RowData(); + (current_segment_->annotation_rows)[Row(decc)] = decode::RowData(); // Add the decoder rows for (const GSList *l = decc->annotation_rows; l; l = l->next) { @@ -954,7 +1010,7 @@ void DecodeSignal::prepare_annotation_segment() const Row row(decc, ann_row); // Add a new empty row data object - (*current_rows_)[row] = decode::RowData(); + (current_segment_->annotation_rows)[row] = decode::RowData(); } } } @@ -974,25 +1030,25 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa assert(pdata->pdo->di); const srd_decoder *const decc = pdata->pdo->di->decoder; assert(decc); - assert(ds->current_rows_); + assert(ds->current_segment_); const srd_proto_data_annotation *const pda = (const srd_proto_data_annotation*)pdata->data; assert(pda); - auto row_iter = ds->current_rows_->end(); + auto row_iter = ds->current_segment_->annotation_rows.end(); // Try 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->current_rows_->find((*r).second); + row_iter = ds->current_segment_->annotation_rows.find((*r).second); else { // Failing that, use the decoder as a key - row_iter = ds->current_rows_->find(Row(decc)); + row_iter = ds->current_segment_->annotation_rows.find(Row(decc)); } - if (row_iter == ds->current_rows_->end()) { + if (row_iter == ds->current_segment_->annotation_rows.end()) { qDebug() << "Unexpected annotation: decoder = " << decc << ", format = " << format; assert(false); @@ -1006,8 +1062,10 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa void DecodeSignal::on_capture_state_changed(int state) { // If a new acquisition was started, we need to start decoding from scratch - if (state == Session::Running) + if (state == Session::Running) { + logic_mux_data_invalid_ = true; begin_decode(); + } } void DecodeSignal::on_data_cleared()