X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=852de2981eb7bd43d9e82cf03154ae7bbeadbff7;hb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;hp=b8e98ece9a5dce42ce5e6e774e689bd34abed5a0;hpb=7e0c99bf95836c89574b53ae3fa7840e2ddca77d;p=pulseview.git diff --git a/pv/session.cpp b/pv/session.cpp index b8e98ece..852de298 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -39,6 +39,7 @@ #include "data/decoderstack.hpp" #include "data/logic.hpp" #include "data/logicsegment.hpp" +#include "data/signalbase.hpp" #include "data/decode/decoder.hpp" #include "devices/hardwaredevice.hpp" @@ -47,6 +48,8 @@ #include "view/analogsignal.hpp" #include "view/decodetrace.hpp" #include "view/logicsignal.hpp" +#include "view/signal.hpp" +#include "view/view.hpp" #include #include @@ -141,13 +144,12 @@ void Session::set_device(shared_ptr device) device_.reset(); // Remove all stored data - signals_.clear(); - { - shared_lock lock(signals_mutex_); - for (const shared_ptr d : all_signal_data_) - d->clear(); - } + for (std::shared_ptr view : views_) + view->clear_signals(); + for (const shared_ptr d : all_signal_data_) + d->clear(); all_signal_data_.clear(); + signalbases_.clear(); cur_logic_segment_.reset(); for (auto entry : cur_analog_segments_) { @@ -223,11 +225,8 @@ void Session::start_capture(function error_handler) } // Clear signal data - { - shared_lock lock(signals_mutex_); - for (const shared_ptr d : all_signal_data_) - d->clear(); - } + for (const shared_ptr d : all_signal_data_) + d->clear(); // Begin the session sampling_thread_ = std::thread( @@ -244,19 +243,26 @@ void Session::stop_capture() sampling_thread_.join(); } +void Session::register_view(std::shared_ptr view) +{ + views_.insert(view); +} + +void Session::deregister_view(std::shared_ptr view) +{ + views_.erase(view); +} + double Session::get_samplerate() const { double samplerate = 0.0; - { - 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()); - } + 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) @@ -265,21 +271,19 @@ double Session::get_samplerate() const return samplerate; } -const unordered_set< shared_ptr > Session::signals() const +const std::unordered_set< std::shared_ptr > + Session::signalbases() const { - shared_lock lock(signals_mutex_); - return signals_; + return signalbases_; } #ifdef ENABLE_DECODE bool Session::add_decoder(srd_decoder *const dec) { - map > channels; + map > channels; shared_ptr decoder_stack; try { - lock_guard lock(signals_mutex_); - // Create the decoder decoder_stack = shared_ptr( new data::DecoderStack(*this, dec)); @@ -293,13 +297,12 @@ 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_) { - shared_ptr l = - dynamic_pointer_cast(s); - if (l && QString::fromUtf8(pdch->name). - toLower().contains( - l->name().toLower())) - channels[pdch] = l; + for (shared_ptr b : signalbases_) { + if (b->type() == ChannelType::LOGIC) { + if (QString::fromUtf8(pdch->name).toLower(). + contains(b->name().toLower())) + channels[pdch] = b; + } } assert(decoder_stack); @@ -308,8 +311,11 @@ bool Session::add_decoder(srd_decoder *const dec) decoder_stack->stack().front()->set_channels(channels); // Create the decode signal + shared_ptr signalbase = + shared_ptr(new data::SignalBase(nullptr)); + shared_ptr d( - new view::DecodeTrace(*this, decoder_stack, + new view::DecodeTrace(*this, signalbase, decoder_stack, decode_traces_.size())); decode_traces_.push_back(d); } catch (std::runtime_error e) { @@ -326,7 +332,6 @@ bool Session::add_decoder(srd_decoder *const dec) vector< shared_ptr > Session::get_decode_signals() const { - shared_lock lock(signals_mutex_); return decode_traces_; } @@ -358,8 +363,10 @@ void Session::set_capture_state(capture_state state) void Session::update_signals() { if (!device_) { - signals_.clear(); + signalbases_.clear(); logic_data_.reset(); + for (std::shared_ptr view : views_) + view->clear_signals(); return; } @@ -367,8 +374,10 @@ void Session::update_signals() const shared_ptr sr_dev = device_->device(); if (!sr_dev) { - signals_.clear(); + signalbases_.clear(); logic_data_.reset(); + for (std::shared_ptr view : views_) + view->clear_signals(); return; } @@ -393,49 +402,64 @@ void Session::update_signals() } } - // Make the Signals list - { - unique_lock lock(signals_mutex_); - - unordered_set< shared_ptr > prev_sigs(signals_); - signals_.clear(); + // Make the signals list + for (std::shared_ptr view : views_) { + unordered_set< shared_ptr > prev_sigs(view->signals()); + view->clear_signals(); for (auto channel : sr_dev->channels()) { + shared_ptr signalbase; shared_ptr signal; // Find the channel in the old signals const auto iter = std::find_if( prev_sigs.cbegin(), prev_sigs.cend(), [&](const shared_ptr &s) { - return s->channel() == channel; + return s->base()->channel() == channel; }); if (iter != prev_sigs.end()) { // Copy the signal from the old set to the new signal = *iter; - auto logic_signal = dynamic_pointer_cast< - view::LogicSignal>(signal); - if (logic_signal) - logic_signal->set_logic_data( - logic_data_); } else { - // Create a new signal + // Find the signalbase for this channel if possible + signalbase.reset(); + for (const shared_ptr b : signalbases_) + if (b->channel() == channel) + signalbase = b; + switch(channel->type()->id()) { case SR_CHANNEL_LOGIC: + if (!signalbase) { + signalbase = shared_ptr( + new data::SignalBase(channel)); + signalbases_.insert(signalbase); + + all_signal_data_.insert(logic_data_); + signalbase->set_data(logic_data_); + } + signal = shared_ptr( new view::LogicSignal(*this, - device_, channel, - logic_data_)); - all_signal_data_.insert(logic_data_); + device_, signalbase)); + view->add_signal(signal); break; case SR_CHANNEL_ANALOG: { - shared_ptr data( - new data::Analog()); + if (!signalbase) { + signalbase = shared_ptr( + new data::SignalBase(channel)); + signalbases_.insert(signalbase); + + shared_ptr data(new data::Analog()); + all_signal_data_.insert(data); + signalbase->set_data(data); + } + signal = shared_ptr( new view::AnalogSignal( - *this, channel, data)); - all_signal_data_.insert(data); + *this, signalbase)); + view->add_signal(signal); break; } @@ -444,25 +468,21 @@ void Session::update_signals() break; } } - - assert(signal); - signals_.insert(signal); } } signals_changed(); } -shared_ptr Session::signal_from_channel( - shared_ptr channel) const +shared_ptr Session::signalbase_from_channel( + shared_ptr channel) const { - lock_guard lock(signals_mutex_); - for (shared_ptr sig : signals_) { + for (shared_ptr sig : signalbases_) { assert(sig); if (sig->channel() == channel) return sig; } - return shared_ptr(); + return shared_ptr(); } void Session::sample_thread_proc(function error_handler) @@ -531,7 +551,6 @@ void Session::feed_in_trigger() uint64_t sample_count = 0; { - shared_lock lock(signals_mutex_); for (const shared_ptr d : all_signal_data_) { assert(d); uint64_t temp_count = 0; @@ -601,7 +620,7 @@ void Session::feed_in_analog(shared_ptr analog) const float *data = static_cast(analog->data_pointer()); bool sweep_beginning = false; - if (signals_.empty()) + if (signalbases_.empty()) update_signals(); for (auto channel : channels) { @@ -625,12 +644,10 @@ void Session::feed_in_analog(shared_ptr analog) cur_analog_segments_[channel] = segment; // Find the analog data associated with the channel - shared_ptr sig = - dynamic_pointer_cast( - signal_from_channel(channel)); - assert(sig); + shared_ptr base = signalbase_from_channel(channel); + assert(base); - shared_ptr data(sig->analog_data()); + shared_ptr data(base->analog_data()); assert(data); // Push the segment into the analog data.