X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=ef1159ee599f8abfbf0a7e6b90d6c100eeef3f44;hp=76bdf683f9dc9b0a2872c4f9f5da8a637837293a;hb=8a7b603b295dacee7160eba8e577d6666472be9f;hpb=fe3a1c218407f6b8a0d7ac7c454593809212ea9e diff --git a/pv/session.cpp b/pv/session.cpp index 76bdf683..ef1159ee 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 @@ -33,6 +41,9 @@ #include "data/logicsegment.hpp" #include "data/decode/decoder.hpp" +#include "devices/hardwaredevice.hpp" +#include "devices/sessionfile.hpp" + #include "view/analogsignal.hpp" #include "view/decodetrace.hpp" #include "view/logicsignal.hpp" @@ -57,9 +68,11 @@ using std::lock_guard; using std::list; using std::map; using std::mutex; +using std::recursive_mutex; using std::set; using std::shared_ptr; using std::string; +using std::unordered_set; using std::vector; using sigrok::Analog; @@ -67,9 +80,7 @@ using sigrok::Channel; using sigrok::ChannelType; using sigrok::ConfigKey; using sigrok::DatafeedCallbackFunction; -using sigrok::Device; using sigrok::Error; -using sigrok::HardwareDevice; using sigrok::Header; using sigrok::Logic; using sigrok::Meta; @@ -84,11 +95,9 @@ using Glib::Variant; namespace pv { Session::Session(DeviceManager &device_manager) : device_manager_(device_manager), - session_(device_manager.context()->create_session()), capture_state_(Stopped), cur_samplerate_(0) { - set_default_device(); } Session::~Session() @@ -107,98 +116,55 @@ const DeviceManager& Session::device_manager() const return device_manager_; } -const shared_ptr& Session::session() const +shared_ptr Session::session() const { - return session_; + if (!device_) + return shared_ptr(); + return device_->session(); } -shared_ptr Session::device() const +shared_ptr Session::device() const { return device_; } -void Session::set_device(shared_ptr device) +void Session::set_device(shared_ptr device) { + assert(device); + // Ensure we are not capturing before setting the device stop_capture(); - // Are we setting a session device? - auto session_device = dynamic_pointer_cast(device); - // Did we have a session device selected previously? - auto prev_session_device = dynamic_pointer_cast(device_); + if (device_) + device_->close(); - if (device_) { - session_->remove_datafeed_callbacks(); - if (!prev_session_device) { - device_->close(); - session_->remove_devices(); - } - } - - if (session_device) - session_ = session_device->parent(); + 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(); - if (device) { - if (!session_device) - { - session_ = device_manager_.context()->create_session(); - - try { - device->open(); - } catch(const sigrok::Error &e) { - throw QString(e.what()); - } - - session_->add_device(device); - } - - device_ = device; - session_->add_datafeed_callback([=] - (shared_ptr device, shared_ptr packet) { - data_feed_in(device, packet); - }); - update_signals(device); - } else - device_ = nullptr; - - device_selected(); -} - -void Session::set_file(const string &name) -{ - session_ = device_manager_.context()->load_session(name); - device_ = session_->devices()[0]; - decode_traces_.clear(); - session_->add_datafeed_callback([=] - (shared_ptr device, shared_ptr packet) { - data_feed_in(device, packet); - }); - device_manager_.update_display_name(device_); - update_signals(device_); device_selected(); } void Session::set_default_device() { - shared_ptr default_device; - const list< shared_ptr > &devices = + const list< shared_ptr > &devices = device_manager_.devices(); - if (!devices.empty()) { - // Fall back to the first device in the list. - default_device = devices.front(); - - // Try and find the demo device and select that by default - for (shared_ptr dev : devices) - if (dev->driver()->name().compare("demo") == 0) { - default_device = dev; - break; - } + if (devices.empty()) + return; - set_device(default_device); - } + // Try and find the demo device and select that by default + const auto iter = std::find_if(devices.begin(), devices.end(), + [] (const shared_ptr &d) { + return d->hardware_device()->driver()->name() == + "demo"; }); + set_device((iter == devices.end()) ? devices.front() : *iter); } Session::capture_state Session::get_capture_state() const @@ -211,22 +177,23 @@ void Session::start_capture(function error_handler) { stop_capture(); - // Check that a device instance has been selected. - if (!device_) { - qDebug() << "No device selected"; - return; - } - // Check that at least one channel is enabled - auto channels = device_->channels(); - bool enabled = std::any_of(channels.begin(), channels.end(), - [](shared_ptr channel) { return channel->enabled(); }); - - if (!enabled) { - error_handler(tr("No channels enabled.")); - return; + assert(device_); + 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; + } } + // Clear signal data + for (const shared_ptr d : get_data()) + d->clear(); + // Begin the session sampling_thread_ = std::thread( &Session::sample_thread_proc, this, device_, @@ -236,7 +203,7 @@ void Session::start_capture(function error_handler) void Session::stop_capture() { if (get_capture_state() != Stopped) - session_->stop(); + device_->stop(); // Check that sampling stopped if (sampling_thread_.joinable()) @@ -255,13 +222,28 @@ set< shared_ptr > Session::get_data() const return data; } -boost::shared_mutex& Session::signals_mutex() const +double Session::get_samplerate() const { - return signals_mutex_; + 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()); + } + + // If there is no sample rate given we use samples as unit + if (samplerate == 0.0) + samplerate = 1.0; + + return samplerate; } -const vector< shared_ptr >& Session::signals() const +const unordered_set< shared_ptr > Session::signals() const { + shared_lock lock(signals_mutex_); return signals_; } @@ -281,9 +263,9 @@ 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 @@ -342,23 +324,33 @@ 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(shared_ptr device) +void Session::update_signals() { - assert(device); - assert(capture_state_ == Stopped); + assert(device_); - // Clear the decode traces - decode_traces_.clear(); + lock_guard lock(data_mutex_); + + const shared_ptr sr_dev = device_->device(); + if (!sr_dev) { + signals_.clear(); + logic_data_.reset(); + return; + } // Detect what data types we will receive - auto channels = device->channels(); + auto channels = sr_dev->channels(); unsigned int logic_channel_count = std::count_if( channels.begin(), channels.end(), [] (shared_ptr channel) { @@ -366,10 +358,12 @@ void Session::update_signals(shared_ptr device) // Create data containers for the logic data segments { - lock_guard data_lock(data_mutex_); + lock_guard data_lock(data_mutex_); - logic_data_.reset(); - if (logic_channel_count != 0) { + if (logic_channel_count == 0) { + logic_data_.reset(); + } else if (!logic_data_ || + logic_data_->num_channels() != logic_channel_count) { logic_data_.reset(new data::Logic( logic_channel_count)); assert(logic_data_); @@ -380,37 +374,55 @@ void Session::update_signals(shared_ptr device) { unique_lock lock(signals_mutex_); + unordered_set< shared_ptr > prev_sigs(signals_); signals_.clear(); - for (auto channel : device->channels()) { + for (auto channel : sr_dev->channels()) { shared_ptr signal; - switch(channel->type()->id()) { - case SR_CHANNEL_LOGIC: - signal = shared_ptr( - new view::LogicSignal(*this, device, - channel, logic_data_)); - break; - - case SR_CHANNEL_ANALOG: - { - shared_ptr data( - new data::Analog()); - signal = shared_ptr( - new view::AnalogSignal( - *this, channel, data)); - break; - } - - default: - assert(0); - break; + // 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; + }); + 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 + switch(channel->type()->id()) { + case SR_CHANNEL_LOGIC: + signal = shared_ptr( + new view::LogicSignal(*this, + device_, channel, + logic_data_)); + break; + + case SR_CHANNEL_ANALOG: + { + shared_ptr data( + new data::Analog()); + signal = shared_ptr( + new view::AnalogSignal( + *this, channel, data)); + break; + } + + default: + assert(0); + break; + } } assert(signal); - signals_.push_back(signal); + signals_.insert(signal); } - } signals_changed(); @@ -428,35 +440,29 @@ shared_ptr Session::signal_from_channel( return shared_ptr(); } -void Session::read_sample_rate(shared_ptr device) -{ - const auto keys = device_->config_keys(ConfigKey::DEVICE_OPTIONS); - const auto iter = keys.find(ConfigKey::SAMPLERATE); - cur_samplerate_ = (iter != keys.end() && - (*iter).second.find(sigrok::GET) != (*iter).second.end()) ? - VariantBase::cast_dynamic>( - device->config_get(ConfigKey::SAMPLERATE)).get() : 0; -} - -void Session::sample_thread_proc(shared_ptr device, +void Session::sample_thread_proc(shared_ptr device, function error_handler) { assert(device); assert(error_handler); - read_sample_rate(device); + (void)device; + + cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); + + out_of_memory_ = false; try { - session_->start(); + device_->start(); } catch(Error e) { error_handler(e.what()); return; } - set_capture_state(session_->trigger() ? + set_capture_state(device_->session()->trigger() ? AwaitingTrigger : Running); - session_->run(); + device_->run(); set_capture_state(Stopped); // Confirm that SR_DF_END was received @@ -465,21 +471,26 @@ void Session::sample_thread_proc(shared_ptr device, 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(shared_ptr device) +void Session::feed_in_header() { - read_sample_rate(device); + cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); } -void Session::feed_in_meta(shared_ptr device, - shared_ptr meta) +void Session::feed_in_meta(shared_ptr meta) { - (void)device; - 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: @@ -491,6 +502,27 @@ void Session::feed_in_meta(shared_ptr device, signals_changed(); } +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; + } + + trigger_event(sample_count / get_samplerate()); +} + void Session::feed_in_frame_begin() { if (cur_logic_segment_ || !cur_analog_segments_.empty()) @@ -499,12 +531,16 @@ void Session::feed_in_frame_begin() void Session::feed_in_logic(shared_ptr logic) { - lock_guard lock(data_mutex_); + lock_guard lock(data_mutex_); + + const size_t sample_count = logic->data_length() / logic->unit_size(); if (!logic_data_) { - qDebug() << "Unexpected logic packet"; - return; + // 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_) @@ -512,20 +548,10 @@ void Session::feed_in_logic(shared_ptr logic) // This could be the first packet after a trigger set_capture_state(Running); - // Get sample limit. - const auto keys = device_->config_keys( - ConfigKey::DEVICE_OPTIONS); - const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES); - const uint64_t sample_limit = (iter != keys.end() && - (*iter).second.find(sigrok::GET) != - (*iter).second.end()) ? - VariantBase::cast_dynamic>( - device_->config_get(ConfigKey::LIMIT_SAMPLES)).get() : 0; - // 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 @@ -545,12 +571,12 @@ void Session::feed_in_logic(shared_ptr logic) void Session::feed_in_analog(shared_ptr analog) { - lock_guard lock(data_mutex_); + lock_guard lock(data_mutex_); 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) @@ -569,22 +595,13 @@ void Session::feed_in_analog(shared_ptr analog) // in the sweep containing this segment. sweep_beginning = true; - // Get sample limit. - uint64_t sample_limit; - try { - 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)); @@ -612,18 +629,26 @@ void Session::feed_in_analog(shared_ptr analog) data_received(); } -void Session::data_feed_in(shared_ptr device, shared_ptr packet) +void Session::data_feed_in(shared_ptr device, + shared_ptr packet) { + (void)device; + assert(device); + assert(device == device_->device()); assert(packet); switch (packet->type()->id()) { case SR_DF_HEADER: - feed_in_header(device); + feed_in_header(); break; case SR_DF_META: - feed_in_meta(device, dynamic_pointer_cast(packet->payload())); + feed_in_meta(dynamic_pointer_cast(packet->payload())); + break; + + case SR_DF_TRIGGER: + feed_in_trigger(); break; case SR_DF_FRAME_BEGIN: @@ -631,17 +656,27 @@ void Session::data_feed_in(shared_ptr device, shared_ptr packet) 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: { { - lock_guard lock(data_mutex_); + lock_guard lock(data_mutex_); cur_logic_segment_.reset(); cur_analog_segments_.clear(); }