X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=90854c7dbaf2b9d2cc26f6fc3d82e4b26bf44c61;hb=7db87de3cf2079f49ad395fba3a0b16f2b0f8ce5;hp=84e1d48fdf19b0f62747745e0d60215d8330c066;hpb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;p=pulseview.git diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 84e1d48f..90854c7d 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -47,8 +47,8 @@ #include -using boost::function; using std::dynamic_pointer_cast; +using std::function; using std::lock_guard; using std::mutex; using std::list; @@ -63,6 +63,9 @@ namespace pv { // TODO: This should not be necessary SigSession* SigSession::_session = NULL; +// TODO: This should not be necessary +struct sr_session *SigSession::_sr_session = NULL; + SigSession::SigSession(DeviceManager &device_manager) : _device_manager(device_manager), _capture_state(Stopped) @@ -77,12 +80,11 @@ SigSession::~SigSession() { using pv::device::Device; + // Stop and join to the thread stop_capture(); - if (_sampling_thread.joinable()) - _sampling_thread.join(); - - _dev_inst->release(); + if (_dev_inst) + _dev_inst->release(); // TODO: This should not be necessary _session = NULL; @@ -98,11 +100,14 @@ void SigSession::set_device( { using pv::device::Device; + if (!dev_inst) + return; + // Ensure we are not capturing before setting the device stop_capture(); if (_dev_inst) { - sr_session_datafeed_callback_remove_all(); + sr_session_datafeed_callback_remove_all(_sr_session); _dev_inst->release(); } @@ -111,7 +116,7 @@ void SigSession::set_device( if (dev_inst) { dev_inst->use(this); - sr_session_datafeed_callback_add(data_feed_in_proc, NULL); + sr_session_datafeed_callback_add(_sr_session, data_feed_in_proc, NULL); update_signals(dev_inst); } } @@ -173,12 +178,12 @@ void SigSession::start_capture(function error_handler) assert(_dev_inst->dev_inst()); - // Check that at least one probe is enabled + // Check that at least one channel 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) + sr_channel *const channel = (sr_channel*)l->data; + assert(channel); + if (channel->enabled) break; } @@ -195,10 +200,8 @@ void SigSession::start_capture(function error_handler) void SigSession::stop_capture() { - if (get_capture_state() == Stopped) - return; - - sr_session_stop(); + if (get_capture_state() != Stopped) + sr_session_stop(_sr_session); // Check that sampling stopped if (_sampling_thread.joinable()) @@ -226,7 +229,7 @@ vector< shared_ptr > SigSession::get_signals() const #ifdef ENABLE_DECODE bool SigSession::add_decoder(srd_decoder *const dec) { - map > probes; + map > channels; shared_ptr decoder_stack; try @@ -237,15 +240,15 @@ bool SigSession::add_decoder(srd_decoder *const dec) 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) + // Auto select the initial channels + for (const srd_channel *pdch : all_channels) for (shared_ptr s : _signals) { shared_ptr l = @@ -253,13 +256,13 @@ bool SigSession::add_decoder(srd_decoder *const dec) if (l && QString::fromUtf8(pdch->name). toLower().contains( l->get_name().toLower())) - probes[pdch] = l; + 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( @@ -312,7 +315,7 @@ void SigSession::update_signals(shared_ptr dev_inst) assert(dev_inst); assert(_capture_state == Stopped); - unsigned int logic_probe_count = 0; + unsigned int logic_channel_count = 0; // Clear the decode traces _decode_traces.clear(); @@ -322,13 +325,13 @@ void SigSession::update_signals(shared_ptr 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) + const sr_channel *const channel = (const sr_channel *)l->data; + if (!channel->enabled) continue; - switch(probe->type) { + switch(channel->type) { case SR_CHANNEL_LOGIC: - logic_probe_count++; + logic_channel_count++; break; } } @@ -339,9 +342,9 @@ void SigSession::update_signals(shared_ptr dev_inst) lock_guard data_lock(_data_mutex); _logic_data.reset(); - if (logic_probe_count != 0) { + if (logic_channel_count != 0) { _logic_data.reset(new data::Logic( - logic_probe_count)); + logic_channel_count)); assert(_logic_data); } } @@ -359,14 +362,14 @@ void SigSession::update_signals(shared_ptr dev_inst) for (const GSList *l = dev_inst->dev_inst()->channels; l; l = l->next) { shared_ptr signal; - sr_channel *const probe = (sr_channel *)l->data; - assert(probe); + sr_channel *const channel = (sr_channel *)l->data; + assert(channel); - switch(probe->type) { + switch(channel->type) { case SR_CHANNEL_LOGIC: signal = shared_ptr( new view::LogicSignal(dev_inst, - probe, _logic_data)); + channel, _logic_data)); break; case SR_CHANNEL_ANALOG: @@ -375,7 +378,7 @@ void SigSession::update_signals(shared_ptr dev_inst) new data::Analog()); signal = shared_ptr( new view::AnalogSignal(dev_inst, - probe, data)); + channel, data)); break; } @@ -393,13 +396,13 @@ void SigSession::update_signals(shared_ptr dev_inst) signals_changed(); } -shared_ptr SigSession::signal_from_probe( - const sr_channel *probe) const +shared_ptr SigSession::signal_from_channel( + const sr_channel *channel) const { 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(); @@ -448,7 +451,7 @@ void SigSession::sample_thread_proc(shared_ptr dev_inst, return; } - set_capture_state(dev_inst->is_trigger_enabled() ? + set_capture_state(sr_session_trigger_get(_sr_session) ? AwaitingTrigger : Running); dev_inst->run(); @@ -533,8 +536,8 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) { 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 unsigned int channel_count = g_slist_length(analog.channels); + const size_t sample_count = analog.num_samples / channel_count; const float *data = analog.data; bool sweep_beginning = false; @@ -542,12 +545,12 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) { shared_ptr snapshot; - sr_channel *const probe = (sr_channel*)p->data; - assert(probe); + sr_channel *const channel = (sr_channel*)p->data; + assert(channel); - // Try to get the snapshot of the probe + // Try to get the snapshot of the channel const map< const sr_channel*, shared_ptr >:: - iterator iter = _cur_analog_snapshots.find(probe); + iterator iter = _cur_analog_snapshots.find(channel); if (iter != _cur_analog_snapshots.end()) snapshot = (*iter).second; else @@ -557,15 +560,15 @@ 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 + // 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; + _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 +582,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) { @@ -631,6 +634,8 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, frame_ended(); break; } + default: + break; } }