X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=73dd339b60fea95259d6fddc7aace7ec9f3ad0e1;hp=da9c0e9bb4af998abf3a3303eb525536245b3ba9;hb=2b05d3110a0a50ce93c8c887a2dc00c1375e92fa;hpb=48257a69ffad409c9893605d99cd6e15161dff4f diff --git a/pv/session.cpp b/pv/session.cpp index da9c0e9b..73dd339b 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -138,16 +138,36 @@ void Session::set_device(shared_ptr device) if (device_) device_->close(); + device_.reset(); + + // Remove all stored data + signals_.clear(); + { + shared_lock lock(signals_mutex_); + for (const shared_ptr d : all_signal_data_) + d->clear(); + } + all_signal_data_.clear(); + cur_logic_segment_.reset(); + + for (auto entry : cur_analog_segments_) { + shared_ptr(entry.first).reset(); + shared_ptr(entry.second).reset(); + } + + logic_data_.reset(); + decode_traces_.clear(); + + signals_changed(); + device_ = std::move(device); device_->open(); device_->session()->add_datafeed_callback([=] (shared_ptr device, shared_ptr packet) { data_feed_in(device, packet); }); - update_signals(); - - decode_traces_.clear(); + update_signals(); device_selected(); } @@ -175,10 +195,14 @@ Session::capture_state Session::get_capture_state() const void Session::start_capture(function error_handler) { + if (!device_) { + error_handler(tr("No active device set, can't start acquisition.")); + return; + } + stop_capture(); // Check that at least one channel is enabled - assert(device_); const shared_ptr sr_dev = device_->device(); if (sr_dev) { const auto channels = sr_dev->channels(); @@ -191,13 +215,15 @@ void Session::start_capture(function error_handler) } // Clear signal data - for (const shared_ptr d : get_data()) - d->clear(); + { + shared_lock lock(signals_mutex_); + for (const shared_ptr d : all_signal_data_) + d->clear(); + } // Begin the session sampling_thread_ = std::thread( - &Session::sample_thread_proc, this, device_, - error_handler); + &Session::sample_thread_proc, this, error_handler); } void Session::stop_capture() @@ -210,30 +236,20 @@ void Session::stop_capture() sampling_thread_.join(); } -set< shared_ptr > Session::get_data() const -{ - shared_lock lock(signals_mutex_); - set< shared_ptr > data; - for (const shared_ptr sig : signals_) { - assert(sig); - data.insert(sig->data()); - } - - return data; -} - double Session::get_samplerate() const { double samplerate = 0.0; - for (const shared_ptr d : get_data()) { - assert(d); - const vector< shared_ptr > segments = - d->segments(); - for (const shared_ptr &s : segments) - samplerate = std::max(samplerate, s->samplerate()); + { + shared_lock lock(signals_mutex_); + for (const shared_ptr d : all_signal_data_) { + assert(d); + const vector< shared_ptr > segments = + d->segments(); + for (const shared_ptr &s : segments) + samplerate = std::max(samplerate, s->samplerate()); + } } - // If there is no sample rate given we use samples as unit if (samplerate == 0.0) samplerate = 1.0; @@ -253,8 +269,7 @@ bool Session::add_decoder(srd_decoder *const dec) map > channels; shared_ptr decoder_stack; - try - { + try { lock_guard lock(signals_mutex_); // Create the decoder @@ -270,8 +285,7 @@ bool Session::add_decoder(srd_decoder *const dec) // Auto select the initial channels for (const srd_channel *pdch : all_channels) - for (shared_ptr s : signals_) - { + for (shared_ptr s : signals_) { shared_ptr l = dynamic_pointer_cast(s); if (l && QString::fromUtf8(pdch->name). @@ -290,9 +304,7 @@ bool Session::add_decoder(srd_decoder *const dec) new view::DecodeTrace(*this, decoder_stack, decode_traces_.size())); decode_traces_.push_back(d); - } - catch(std::runtime_error e) - { + } catch (std::runtime_error e) { return false; } @@ -313,8 +325,7 @@ vector< shared_ptr > Session::get_decode_signals() const void Session::remove_decode_signal(view::DecodeTrace *signal) { for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++) - if ((*i).get() == signal) - { + if ((*i).get() == signal) { decode_traces_.erase(i); signals_changed(); return; @@ -324,16 +335,25 @@ void Session::remove_decode_signal(view::DecodeTrace *signal) void Session::set_capture_state(capture_state state) { - lock_guard lock(sampling_mutex_); - const bool changed = capture_state_ != state; - capture_state_ = state; + bool changed; + + { + lock_guard lock(sampling_mutex_); + changed = capture_state_ != state; + capture_state_ = state; + } + if (changed) capture_state_changed(state); } void Session::update_signals() { - assert(device_); + if (!device_) { + signals_.clear(); + logic_data_.reset(); + return; + } lock_guard lock(data_mutex_); @@ -397,6 +417,7 @@ void Session::update_signals() new view::LogicSignal(*this, device_, channel, logic_data_)); + all_signal_data_.insert(logic_data_); break; case SR_CHANNEL_ANALOG: @@ -406,6 +427,7 @@ void Session::update_signals() signal = shared_ptr( new view::AnalogSignal( *this, channel, data)); + all_signal_data_.insert(data); break; } @@ -435,13 +457,12 @@ shared_ptr Session::signal_from_channel( return shared_ptr(); } -void Session::sample_thread_proc(shared_ptr device, - function error_handler) +void Session::sample_thread_proc(function error_handler) { - assert(device); assert(error_handler); - (void)device; + if (!device_) + return; cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); @@ -449,7 +470,7 @@ void Session::sample_thread_proc(shared_ptr device, try { device_->start(); - } catch(Error e) { + } catch (Error e) { error_handler(e.what()); return; } @@ -461,8 +482,7 @@ void Session::sample_thread_proc(shared_ptr device, set_capture_state(Stopped); // Confirm that SR_DF_END was received - if (cur_logic_segment_) - { + if (cur_logic_segment_) { qDebug("SR_DF_END was not received."); assert(0); } @@ -481,6 +501,11 @@ void Session::feed_in_meta(shared_ptr meta) for (auto entry : meta->config()) { switch (entry.first->id()) { case SR_CONF_SAMPLERATE: + // We can't rely on the header to always contain the sample rate, + // so in case it's supplied via a meta packet, we use it. + if (!cur_samplerate_) + cur_samplerate_ = g_variant_get_uint64(entry.second.gobj()); + /// @todo handle samplerate changes break; default: @@ -497,17 +522,20 @@ void Session::feed_in_trigger() // The channel containing most samples should be most accurate uint64_t sample_count = 0; - for (const shared_ptr d : get_data()) { - assert(d); - uint64_t temp_count = 0; - - const vector< shared_ptr > segments = - d->segments(); - for (const shared_ptr &s : segments) - temp_count += s->get_sample_count(); - - if (temp_count > sample_count) - sample_count = temp_count; + { + shared_lock lock(signals_mutex_); + for (const shared_ptr d : all_signal_data_) { + assert(d); + uint64_t temp_count = 0; + + const vector< shared_ptr > segments = + d->segments(); + for (const shared_ptr &s : segments) + temp_count += s->get_sample_count(); + + if (temp_count > sample_count) + sample_count = temp_count; + } } trigger_event(sample_count / get_samplerate()); @@ -525,16 +553,14 @@ void Session::feed_in_logic(shared_ptr logic) const size_t sample_count = logic->data_length() / logic->unit_size(); - if (!logic_data_) - { + if (!logic_data_) { // The only reason logic_data_ would not have been created is // if it was not possible to determine the signals when the // device was created. update_signals(); } - if (!cur_logic_segment_) - { + if (!cur_logic_segment_) { // This could be the first packet after a trigger set_capture_state(Running); @@ -549,9 +575,7 @@ void Session::feed_in_logic(shared_ptr logic) // frame_began is DecoderStack, but in future we need to signal // this after both analog and logic sweeps have begun. frame_began(); - } - else - { + } else { // Append to the existing data segment cur_logic_segment_->append_payload(logic); } @@ -569,8 +593,10 @@ void Session::feed_in_analog(shared_ptr analog) const float *data = static_cast(analog->data_pointer()); bool sweep_beginning = false; - for (auto channel : channels) - { + if (signals_.empty()) + update_signals(); + + for (auto channel : channels) { shared_ptr segment; // Try to get the segment of the channel @@ -578,9 +604,8 @@ void Session::feed_in_analog(shared_ptr analog) iterator iter = cur_analog_segments_.find(channel); if (iter != cur_analog_segments_.end()) segment = (*iter).second; - else - { - // If no segment was found, this means we havn't + else { + // If no segment was found, this means we haven't // created one yet. i.e. this is the first packet // in the sweep containing this segment. sweep_beginning = true;