X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=f3eb19460593141de7b33740bb94eb2d0e69f4a3;hp=87b561eb11ccc8a09aea5db2b1f2f652810a5344;hb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;hpb=b1e8c93d824986328a34d1c36273cb534fd65307 diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 87b561eb..f3eb1946 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -22,22 +22,20 @@ #include #endif -#include "sigsession.h" +#include "sigsession.hpp" -#include "devicemanager.h" -#include "device/device.h" -#include "device/file.h" +#include "devicemanager.hpp" -#include "data/analog.h" -#include "data/analogsnapshot.h" -#include "data/decoderstack.h" -#include "data/logic.h" -#include "data/logicsnapshot.h" -#include "data/decode/decoder.h" +#include "data/analog.hpp" +#include "data/analogsnapshot.hpp" +#include "data/decoderstack.hpp" +#include "data/logic.hpp" +#include "data/logicsnapshot.hpp" +#include "data/decode/decoder.hpp" -#include "view/analogsignal.h" -#include "view/decodetrace.h" -#include "view/logicsignal.h" +#include "view/analogsignal.hpp" +#include "view/decodetrace.hpp" +#include "view/logicsignal.hpp" #include #include @@ -47,118 +45,154 @@ #include +#include + +using boost::shared_lock; +using boost::shared_mutex; +using boost::unique_lock; + using std::dynamic_pointer_cast; using std::function; using std::lock_guard; -using std::mutex; using std::list; using std::map; +using std::mutex; using std::set; using std::shared_ptr; using std::string; using std::vector; -namespace pv { - -// TODO: This should not be necessary -SigSession* SigSession::_session = NULL; +using sigrok::Analog; +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; +using sigrok::Packet; +using sigrok::PacketPayload; +using sigrok::Session; +using sigrok::SessionDevice; + +using Glib::VariantBase; +using Glib::Variant; +namespace pv { SigSession::SigSession(DeviceManager &device_manager) : - _device_manager(device_manager), - _capture_state(Stopped) + device_manager_(device_manager), + session_(device_manager.context()->create_session()), + capture_state_(Stopped) { - // TODO: This should not be necessary - _session = this; - set_default_device(); } SigSession::~SigSession() { - using pv::device::Device; - + // Stop and join to the thread stop_capture(); +} - if (_sampling_thread.joinable()) - _sampling_thread.join(); - - _dev_inst->release(); +DeviceManager& SigSession::device_manager() +{ + return device_manager_; +} - // TODO: This should not be necessary - _session = NULL; +const DeviceManager& SigSession::device_manager() const +{ + return device_manager_; } -shared_ptr SigSession::get_device() const +const shared_ptr& SigSession::session() const { - return _dev_inst; + return session_; } -void SigSession::set_device( - shared_ptr dev_inst) throw(QString) +shared_ptr SigSession::device() const { - using pv::device::Device; + return device_; +} +void SigSession::set_device(shared_ptr device) +{ // Ensure we are not capturing before setting the device stop_capture(); - if (_dev_inst) { - sr_session_datafeed_callback_remove_all(); - _dev_inst->release(); + // 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_) { + session_->remove_datafeed_callbacks(); + if (!prev_session_device) { + device_->close(); + session_->remove_devices(); + } } - _dev_inst = dev_inst; - _decode_traces.clear(); + if (session_device) + session_ = session_device->parent(); + + device_ = device; + decode_traces_.clear(); - if (dev_inst) { - dev_inst->use(this); - sr_session_datafeed_callback_add(data_feed_in_proc, NULL); - update_signals(dev_inst); + if (device) { + if (!session_device) + { + session_ = device_manager_.context()->create_session(); + device->open(); + session_->add_device(device); + } + session_->add_datafeed_callback([=] + (shared_ptr device, shared_ptr packet) { + data_feed_in(device, packet); + }); + update_signals(device); } } -void SigSession::set_file(const string &name) throw(QString) +void SigSession::set_file(const string &name) { - // Deselect the old device, because file type detection in File::create - // destroys the old session inside libsigrok. - set_device(shared_ptr()); - set_device(shared_ptr(device::File::create(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_); } void SigSession::set_default_device() { - shared_ptr default_device; - const list< shared_ptr > &devices = - _device_manager.devices(); + shared_ptr default_device; + 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 (strcmp(dev->dev_inst()->driver->name, - "demo") == 0) { + for (shared_ptr dev : devices) + if (dev->driver()->name().compare("demo") == 0) { default_device = dev; break; } - } - set_device(default_device); -} - -void SigSession::release_device(device::DevInst *dev_inst) -{ - (void)dev_inst; - assert(_dev_inst.get() == dev_inst); - - assert(_capture_state == Stopped); - _dev_inst = shared_ptr(); + set_device(default_device); + } } SigSession::capture_state SigSession::get_capture_state() const { - lock_guard lock(_sampling_mutex); - return _capture_state; + lock_guard lock(sampling_mutex_); + return capture_state_; } void SigSession::start_capture(function error_handler) @@ -166,50 +200,42 @@ void SigSession::start_capture(function error_handler) stop_capture(); // Check that a device instance has been selected. - if (!_dev_inst) { + if (!device_) { qDebug() << "No device selected"; return; } - assert(_dev_inst->dev_inst()); - - // Check that at least one probe is enabled - const GSList *l; - for (l = _dev_inst->dev_inst()->channels; l; l = l->next) { - sr_channel *const probe = (sr_channel*)l->data; - assert(probe); - if (probe->enabled) - break; - } + // 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 (!l) { + if (!enabled) { error_handler(tr("No channels enabled.")); return; } // Begin the session - _sampling_thread = std::thread( - &SigSession::sample_thread_proc, this, _dev_inst, + sampling_thread_ = std::thread( + &SigSession::sample_thread_proc, this, device_, error_handler); } void SigSession::stop_capture() { - if (get_capture_state() == Stopped) - return; - - sr_session_stop(); + if (get_capture_state() != Stopped) + session_->stop(); // Check that sampling stopped - if (_sampling_thread.joinable()) - _sampling_thread.join(); + if (sampling_thread_.joinable()) + sampling_thread_.join(); } set< shared_ptr > SigSession::get_data() const { - lock_guard lock(_signals_mutex); + shared_lock lock(signals_mutex_); set< shared_ptr > data; - for (const shared_ptr sig : _signals) { + for (const shared_ptr sig : signals_) { assert(sig); data.insert(sig->data()); } @@ -217,55 +243,59 @@ set< shared_ptr > SigSession::get_data() const return data; } -vector< shared_ptr > SigSession::get_signals() const +boost::shared_mutex& SigSession::signals_mutex() const +{ + return signals_mutex_; +} + +const vector< shared_ptr >& SigSession::signals() const { - lock_guard lock(_signals_mutex); - return _signals; + return signals_; } #ifdef ENABLE_DECODE bool SigSession::add_decoder(srd_decoder *const dec) { - map > probes; + map > channels; shared_ptr decoder_stack; try { - lock_guard lock(_signals_mutex); + lock_guard lock(signals_mutex_); // Create the decoder decoder_stack = shared_ptr( new data::DecoderStack(*this, dec)); - // Make a list of all the probes - std::vector all_probes; + // Make a list of all the channels + std::vector all_channels; for(const GSList *i = dec->channels; i; i = i->next) - all_probes.push_back((const srd_channel*)i->data); + all_channels.push_back((const srd_channel*)i->data); for(const GSList *i = dec->opt_channels; i; i = i->next) - all_probes.push_back((const srd_channel*)i->data); + all_channels.push_back((const srd_channel*)i->data); - // Auto select the initial probes - for (const srd_channel *pdch : all_probes) - for (shared_ptr s : _signals) + // 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->get_name().toLower())) - probes[pdch] = l; + l->name().toLower())) + channels[pdch] = l; } assert(decoder_stack); assert(!decoder_stack->stack().empty()); assert(decoder_stack->stack().front()); - decoder_stack->stack().front()->set_probes(probes); + decoder_stack->stack().front()->set_channels(channels); // Create the decode signal shared_ptr d( new view::DecodeTrace(*this, decoder_stack, - _decode_traces.size())); - _decode_traces.push_back(d); + decode_traces_.size())); + decode_traces_.push_back(d); } catch(std::runtime_error e) { @@ -282,16 +312,16 @@ bool SigSession::add_decoder(srd_decoder *const dec) vector< shared_ptr > SigSession::get_decode_signals() const { - lock_guard lock(_signals_mutex); - return _decode_traces; + shared_lock lock(signals_mutex_); + return decode_traces_; } void SigSession::remove_decode_signal(view::DecodeTrace *signal) { - for (auto i = _decode_traces.begin(); i != _decode_traces.end(); i++) + for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++) if ((*i).get() == signal) { - _decode_traces.erase(i); + decode_traces_.erase(i); signals_changed(); return; } @@ -300,73 +330,54 @@ void SigSession::remove_decode_signal(view::DecodeTrace *signal) void SigSession::set_capture_state(capture_state state) { - lock_guard lock(_sampling_mutex); - const bool changed = _capture_state != state; - _capture_state = state; + lock_guard lock(sampling_mutex_); + const bool changed = capture_state_ != state; + capture_state_ = state; if(changed) capture_state_changed(state); } -void SigSession::update_signals(shared_ptr dev_inst) +void SigSession::update_signals(shared_ptr device) { - assert(dev_inst); - assert(_capture_state == Stopped); - - unsigned int logic_probe_count = 0; + assert(device); + assert(capture_state_ == Stopped); // Clear the decode traces - _decode_traces.clear(); + decode_traces_.clear(); // Detect what data types we will receive - if(dev_inst) { - assert(dev_inst->dev_inst()); - for (const GSList *l = dev_inst->dev_inst()->channels; - l; l = l->next) { - const sr_channel *const probe = (const sr_channel *)l->data; - if (!probe->enabled) - continue; - - switch(probe->type) { - case SR_CHANNEL_LOGIC: - logic_probe_count++; - break; - } - } - } + auto channels = device->channels(); + unsigned int logic_channel_count = std::count_if( + channels.begin(), channels.end(), + [] (shared_ptr channel) { + return channel->type() == ChannelType::LOGIC; }); // Create data containers for the logic data snapshots { - lock_guard data_lock(_data_mutex); + lock_guard data_lock(data_mutex_); - _logic_data.reset(); - if (logic_probe_count != 0) { - _logic_data.reset(new data::Logic( - logic_probe_count)); - assert(_logic_data); + logic_data_.reset(); + if (logic_channel_count != 0) { + logic_data_.reset(new data::Logic( + logic_channel_count)); + assert(logic_data_); } } // Make the Signals list - do { - lock_guard lock(_signals_mutex); - - _signals.clear(); + { + unique_lock lock(signals_mutex_); - if(!dev_inst) - break; + signals_.clear(); - assert(dev_inst->dev_inst()); - for (const GSList *l = dev_inst->dev_inst()->channels; - l; l = l->next) { + for (auto channel : device->channels()) { shared_ptr signal; - sr_channel *const probe = (sr_channel *)l->data; - assert(probe); - switch(probe->type) { + switch(channel->type()->id()) { case SR_CHANNEL_LOGIC: signal = shared_ptr( - new view::LogicSignal(dev_inst, - probe, _logic_data)); + new view::LogicSignal(*this, device, + channel, logic_data_)); break; case SR_CHANNEL_ANALOG: @@ -374,8 +385,8 @@ void SigSession::update_signals(shared_ptr dev_inst) shared_ptr data( new data::Analog()); signal = shared_ptr( - new view::AnalogSignal(dev_inst, - probe, data)); + new view::AnalogSignal( + *this, channel, data)); break; } @@ -385,44 +396,30 @@ void SigSession::update_signals(shared_ptr dev_inst) } assert(signal); - _signals.push_back(signal); + signals_.push_back(signal); } - } while(0); + } signals_changed(); } -shared_ptr SigSession::signal_from_probe( - const sr_channel *probe) const +shared_ptr SigSession::signal_from_channel( + shared_ptr channel) const { - lock_guard lock(_signals_mutex); - for (shared_ptr sig : _signals) { + lock_guard lock(signals_mutex_); + for (shared_ptr sig : signals_) { assert(sig); - if (sig->probe() == probe) + if (sig->channel() == channel) return sig; } return shared_ptr(); } -void SigSession::read_sample_rate(const sr_dev_inst *const sdi) +void SigSession::read_sample_rate(shared_ptr device) { - GVariant *gvar; - uint64_t sample_rate = 0; - - // Read out the sample rate - if(sdi->driver) - { - const int ret = sr_config_get(sdi->driver, sdi, NULL, - SR_CONF_SAMPLERATE, &gvar); - if (ret != SR_OK) { - qDebug("Failed to get samplerate\n"); - return; - } - - sample_rate = g_variant_get_uint64(gvar); - g_variant_unref(gvar); - } + uint64_t sample_rate = VariantBase::cast_dynamic>( + device->config_get(ConfigKey::SAMPLERATE)).get(); // Set the sample rate of all data const set< shared_ptr > data_set = get_data(); @@ -432,52 +429,49 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi) } } -void SigSession::sample_thread_proc(shared_ptr dev_inst, +void SigSession::sample_thread_proc(shared_ptr device, function error_handler) { - assert(dev_inst); - assert(dev_inst->dev_inst()); + assert(device); assert(error_handler); - read_sample_rate(dev_inst->dev_inst()); + read_sample_rate(device); try { - dev_inst->start(); - } catch(const QString e) { - error_handler(e); + session_->start(); + } catch(Error e) { + error_handler(e.what()); return; } - set_capture_state(sr_session_trigger_get() ? + set_capture_state(session_->trigger() ? AwaitingTrigger : Running); - dev_inst->run(); + session_->run(); set_capture_state(Stopped); // Confirm that SR_DF_END was received - if (_cur_logic_snapshot) + if (cur_logic_snapshot_) { qDebug("SR_DF_END was not received."); assert(0); } } -void SigSession::feed_in_header(const sr_dev_inst *sdi) +void SigSession::feed_in_header(shared_ptr device) { - read_sample_rate(sdi); + read_sample_rate(device); } -void SigSession::feed_in_meta(const sr_dev_inst *sdi, - const sr_datafeed_meta &meta) +void SigSession::feed_in_meta(shared_ptr device, + shared_ptr meta) { - (void)sdi; + (void)device; - for (const GSList *l = meta.config; l; l = l->next) { - const sr_config *const src = (const sr_config*)l->data; - switch (src->key) { + for (auto entry : meta->config()) { + switch (entry.first->id()) { case SR_CONF_SAMPLERATE: /// @todo handle samplerate changes - /// samplerate = (uint64_t *)src->value; break; default: // Unknown metadata is not an error. @@ -490,29 +484,38 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi, void SigSession::feed_in_frame_begin() { - if (_cur_logic_snapshot || !_cur_analog_snapshots.empty()) + if (cur_logic_snapshot_ || !cur_analog_snapshots_.empty()) frame_began(); } -void SigSession::feed_in_logic(const sr_datafeed_logic &logic) +void SigSession::feed_in_logic(shared_ptr logic) { - lock_guard lock(_data_mutex); + lock_guard lock(data_mutex_); - if (!_logic_data) + if (!logic_data_) { qDebug() << "Unexpected logic packet"; return; } - if (!_cur_logic_snapshot) + if (!cur_logic_snapshot_) { // This could be the first packet after a trigger set_capture_state(Running); + // 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 new data snapshot - _cur_logic_snapshot = shared_ptr( - new data::LogicSnapshot(logic, _dev_inst->get_sample_limit())); - _logic_data->push_snapshot(_cur_logic_snapshot); + cur_logic_snapshot_ = shared_ptr( + new data::LogicSnapshot(logic, sample_limit)); + logic_data_->push_snapshot(cur_logic_snapshot_); // @todo Putting this here means that only listeners querying // for logic will be notified. Currently the only user of @@ -523,32 +526,30 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic) else { // Append to the existing data snapshot - _cur_logic_snapshot->append_payload(logic); + cur_logic_snapshot_->append_payload(logic); } data_received(); } -void SigSession::feed_in_analog(const sr_datafeed_analog &analog) +void SigSession::feed_in_analog(shared_ptr analog) { - lock_guard lock(_data_mutex); + lock_guard lock(data_mutex_); - const unsigned int probe_count = g_slist_length(analog.channels); - const size_t sample_count = analog.num_samples / probe_count; - const float *data = analog.data; + 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(); bool sweep_beginning = false; - for (GSList *p = analog.channels; p; p = p->next) + for (auto channel : channels) { shared_ptr snapshot; - sr_channel *const probe = (sr_channel*)p->data; - assert(probe); - - // Try to get the snapshot of the probe - const map< const sr_channel*, shared_ptr >:: - iterator iter = _cur_analog_snapshots.find(probe); - if (iter != _cur_analog_snapshots.end()) + // Try to get the snapshot of the channel + const map< shared_ptr, shared_ptr >:: + iterator iter = cur_analog_snapshots_.find(channel); + if (iter != cur_analog_snapshots_.end()) snapshot = (*iter).second; else { @@ -557,15 +558,24 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) // in the sweep containing this snapshot. sweep_beginning = true; - // Create a snapshot, keep it in the maps of probes + // 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 snapshot, keep it in the maps of channels snapshot = shared_ptr( - new data::AnalogSnapshot(_dev_inst->get_sample_limit())); - _cur_analog_snapshots[probe] = snapshot; + new data::AnalogSnapshot(sample_limit)); + cur_analog_snapshots_[channel] = snapshot; - // Find the annalog data associated with the probe + // Find the annalog data associated with the channel shared_ptr sig = dynamic_pointer_cast( - signal_from_probe(probe)); + signal_from_channel(channel)); assert(sig); shared_ptr data(sig->analog_data()); @@ -579,7 +589,7 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) // Append the samples in the snapshot snapshot->append_interleaved_samples(data++, sample_count, - probe_count); + channel_count); } if (sweep_beginning) { @@ -590,21 +600,18 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) data_received(); } -void SigSession::data_feed_in(const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *packet) +void SigSession::data_feed_in(shared_ptr device, shared_ptr packet) { - assert(sdi); + assert(device); assert(packet); - switch (packet->type) { + switch (packet->type()->id()) { case SR_DF_HEADER: - feed_in_header(sdi); + feed_in_header(device); break; case SR_DF_META: - assert(packet->payload); - feed_in_meta(sdi, - *(const sr_datafeed_meta*)packet->payload); + feed_in_meta(device, dynamic_pointer_cast(packet->payload())); break; case SR_DF_FRAME_BEGIN: @@ -612,34 +619,26 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, break; case SR_DF_LOGIC: - assert(packet->payload); - feed_in_logic(*(const sr_datafeed_logic*)packet->payload); + feed_in_logic(dynamic_pointer_cast(packet->payload())); break; case SR_DF_ANALOG: - assert(packet->payload); - feed_in_analog(*(const sr_datafeed_analog*)packet->payload); + feed_in_analog(dynamic_pointer_cast(packet->payload())); break; case SR_DF_END: { { - lock_guard lock(_data_mutex); - _cur_logic_snapshot.reset(); - _cur_analog_snapshots.clear(); + lock_guard lock(data_mutex_); + cur_logic_snapshot_.reset(); + cur_analog_snapshots_.clear(); } frame_ended(); break; } + default: + break; } } -void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi, - const struct sr_datafeed_packet *packet, void *cb_data) -{ - (void) cb_data; - assert(_session); - _session->data_feed_in(sdi, packet); -} - } // namespace pv