X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=73dd339b60fea95259d6fddc7aace7ec9f3ad0e1;hp=2a4814f807e2be19fe0c4aeef93d5abfb982e13f;hb=2b05d3110a0a50ce93c8c887a2dc00c1375e92fa;hpb=4365a4406b5a81a12c6a7d0fbaed01f6d59df882 diff --git a/pv/session.cpp b/pv/session.cpp index 2a4814f8..73dd339b 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -18,6 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef _WIN32 +// Windows: Avoid boost/thread namespace pollution (which includes windows.h). +#define NOGDI +#define NORESOURCE +#endif +#include +#include + #ifdef ENABLE_DECODE #include #endif @@ -90,7 +98,6 @@ Session::Session(DeviceManager &device_manager) : capture_state_(Stopped), cur_samplerate_(0) { - set_default_device(); } Session::~Session() @@ -128,16 +135,39 @@ void Session::set_device(shared_ptr device) // Ensure we are not capturing before setting the device stop_capture(); + 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_->create(); + 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(); } @@ -165,25 +195,35 @@ 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 std::shared_ptr device = device_->device(); - assert(device); - auto channels = device->channels(); - bool enabled = std::any_of(channels.begin(), channels.end(), - [](shared_ptr channel) { return channel->enabled(); }); + const shared_ptr sr_dev = device_->device(); + if (sr_dev) { + const auto channels = sr_dev->channels(); + if (!std::any_of(channels.begin(), channels.end(), + [](shared_ptr channel) { + return channel->enabled(); })) { + error_handler(tr("No channels enabled.")); + return; + } + } - if (!enabled) { - error_handler(tr("No channels enabled.")); - return; + // Clear signal data + { + 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() @@ -196,25 +236,30 @@ void Session::stop_capture() sampling_thread_.join(); } -set< shared_ptr > Session::get_data() const +double Session::get_samplerate() const { - shared_lock lock(signals_mutex_); - set< shared_ptr > data; - for (const shared_ptr sig : signals_) { - assert(sig); - data.insert(sig->data()); - } + double samplerate = 0.0; - return data; -} + { + 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; -boost::shared_mutex& Session::signals_mutex() const -{ - return signals_mutex_; + return samplerate; } -const unordered_set< shared_ptr >& Session::signals() const +const unordered_set< shared_ptr > Session::signals() const { + shared_lock lock(signals_mutex_); return signals_; } @@ -224,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 @@ -234,15 +278,14 @@ bool Session::add_decoder(srd_decoder *const dec) // Make a list of all the channels std::vector all_channels; - for(const GSList *i = dec->channels; i; i = i->next) + for (const GSList *i = dec->channels; i; i = i->next) all_channels.push_back((const srd_channel*)i->data); - for(const GSList *i = dec->opt_channels; i; i = i->next) + for (const GSList *i = dec->opt_channels; i; i = i->next) all_channels.push_back((const srd_channel*)i->data); // 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). @@ -261,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; } @@ -284,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; @@ -295,17 +335,27 @@ 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; - if(changed) + 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_); - assert(capture_state_ == Stopped); + if (!device_) { + signals_.clear(); + logic_data_.reset(); + return; + } + + lock_guard lock(data_mutex_); const shared_ptr sr_dev = device_->device(); if (!sr_dev) { @@ -367,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: @@ -376,6 +427,7 @@ void Session::update_signals() signal = shared_ptr( new view::AnalogSignal( *this, channel, data)); + all_signal_data_.insert(data); break; } @@ -405,17 +457,20 @@ 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); + if (!device_) + return; + cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); + out_of_memory_ = false; + try { - device_->session()->start(); - } catch(Error e) { + device_->start(); + } catch (Error e) { error_handler(e.what()); return; } @@ -427,11 +482,13 @@ 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); } + + if (out_of_memory_) + error_handler(tr("Out of memory, acquisition stopped.")); } void Session::feed_in_header() @@ -444,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: @@ -455,6 +517,30 @@ void Session::feed_in_meta(shared_ptr meta) signals_changed(); } +void Session::feed_in_trigger() +{ + // The channel containing most samples should be most accurate + 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; + + 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()); +} + void Session::feed_in_frame_begin() { if (cur_logic_segment_ || !cur_analog_segments_.empty()) @@ -465,25 +551,23 @@ void Session::feed_in_logic(shared_ptr logic) { lock_guard lock(data_mutex_); - if (!logic_data_) - { - qDebug() << "Unexpected logic packet"; - return; + const size_t sample_count = logic->data_length() / logic->unit_size(); + + 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); - // Get sample limit. - const uint64_t sample_limit = device_->read_config( - ConfigKey::LIMIT_SAMPLES); - // Create a new data segment cur_logic_segment_ = shared_ptr( new data::LogicSegment( - logic, cur_samplerate_, sample_limit)); + logic, cur_samplerate_, sample_count)); logic_data_->push_segment(cur_logic_segment_); // @todo Putting this here means that only listeners querying @@ -491,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); } @@ -508,11 +590,13 @@ void Session::feed_in_analog(shared_ptr analog) const vector> channels = analog->channels(); const unsigned int channel_count = channels.size(); const size_t sample_count = analog->num_samples() / channel_count; - const float *data = analog->data_pointer(); + 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 @@ -520,33 +604,19 @@ 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; - // Get sample limit. - uint64_t sample_limit; - try { - assert(device_); - const std::shared_ptr device = - device_->device(); - assert(device); - sample_limit = VariantBase::cast_dynamic>( - device->config_get(ConfigKey::LIMIT_SAMPLES)).get(); - } catch (Error) { - sample_limit = 0; - } - // Create a segment, keep it in the maps of channels segment = shared_ptr( new data::AnalogSegment( - cur_samplerate_, sample_limit)); + cur_samplerate_, sample_count)); cur_analog_segments_[channel] = segment; - // Find the annalog data associated with the channel + // Find the analog data associated with the channel shared_ptr sig = dynamic_pointer_cast( signal_from_channel(channel)); @@ -592,16 +662,30 @@ void Session::data_feed_in(shared_ptr device, feed_in_meta(dynamic_pointer_cast(packet->payload())); break; + case SR_DF_TRIGGER: + feed_in_trigger(); + break; + case SR_DF_FRAME_BEGIN: feed_in_frame_begin(); break; case SR_DF_LOGIC: - feed_in_logic(dynamic_pointer_cast(packet->payload())); + try { + feed_in_logic(dynamic_pointer_cast(packet->payload())); + } catch (std::bad_alloc) { + out_of_memory_ = true; + device_->stop(); + } break; case SR_DF_ANALOG: - feed_in_analog(dynamic_pointer_cast(packet->payload())); + try { + feed_in_analog(dynamic_pointer_cast(packet->payload())); + } catch (std::bad_alloc) { + out_of_memory_ = true; + device_->stop(); + } break; case SR_DF_END: