X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=90854c7dbaf2b9d2cc26f6fc3d82e4b26bf44c61;hp=1a5ac8cad96405655af7cfd0ca0211d6695b3e2d;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hpb=82f50b10f8fd45a772f9ba40c4ef1f888ed6b8b1 diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 1a5ac8ca..90854c7d 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -39,24 +39,22 @@ #include "view/decodetrace.h" #include "view/logicsignal.h" -#include - +#include +#include #include -#include - #include #include -using boost::dynamic_pointer_cast; -using boost::function; -using boost::lock_guard; -using boost::mutex; -using boost::shared_ptr; +using std::dynamic_pointer_cast; +using std::function; +using std::lock_guard; +using std::mutex; using std::list; using std::map; using std::set; +using std::shared_ptr; using std::string; using std::vector; @@ -65,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) @@ -79,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; @@ -100,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(); } @@ -113,19 +116,41 @@ 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); } } void SigSession::set_file(const string &name) throw(QString) { - // Deslect the old device, because file type detection in File::create - // destorys the old session inside libsigrok. + // 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))); } +void SigSession::set_default_device() +{ + 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) { + default_device = dev; + break; + } + } + + set_device(default_device); +} + void SigSession::release_device(device::DevInst *dev_inst) { (void)dev_inst; @@ -153,32 +178,30 @@ 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()->probes; l; l = l->next) { - sr_probe *const probe = (sr_probe*)l->data; - assert(probe); - if (probe->enabled) + for (l = _dev_inst->dev_inst()->channels; l; l = l->next) { + sr_channel *const channel = (sr_channel*)l->data; + assert(channel); + if (channel->enabled) break; } if (!l) { - error_handler(tr("No probes enabled.")); + error_handler(tr("No channels enabled.")); return; } // Begin the session - _sampling_thread = boost::thread( + _sampling_thread = std::thread( &SigSession::sample_thread_proc, this, _dev_inst, 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()) @@ -189,7 +212,7 @@ set< shared_ptr > SigSession::get_data() const { lock_guard lock(_signals_mutex); set< shared_ptr > data; - BOOST_FOREACH(const shared_ptr sig, _signals) { + for (const shared_ptr sig : _signals) { assert(sig); data.insert(sig->data()); } @@ -206,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 @@ -217,29 +240,29 @@ 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; - for(const GSList *i = dec->probes; i; i = i->next) - all_probes.push_back((const srd_probe*)i->data); - for(const GSList *i = dec->opt_probes; i; i = i->next) - all_probes.push_back((const srd_probe*)i->data); + // Make a list of all the channels + std::vector all_channels; + 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) + all_channels.push_back((const srd_channel*)i->data); - // Auto select the initial probes - BOOST_FOREACH(const srd_probe *probe, all_probes) - BOOST_FOREACH(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(probe->name). + if (l && QString::fromUtf8(pdch->name). toLower().contains( l->get_name().toLower())) - probes[probe] = 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( @@ -268,10 +291,7 @@ vector< shared_ptr > SigSession::get_decode_signals() const void SigSession::remove_decode_signal(view::DecodeTrace *signal) { - for (vector< shared_ptr >::iterator 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); @@ -290,34 +310,12 @@ void SigSession::set_capture_state(capture_state state) capture_state_changed(state); } -void SigSession::set_default_device() -{ - 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 - BOOST_FOREACH (shared_ptr dev, devices) - if (strcmp(dev->dev_inst()->driver->name, - "demo") == 0) { - default_device = dev; - break; - } - } - - set_device(default_device); -} - 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(); @@ -325,15 +323,15 @@ void SigSession::update_signals(shared_ptr dev_inst) // Detect what data types we will receive if(dev_inst) { assert(dev_inst->dev_inst()); - for (const GSList *l = dev_inst->dev_inst()->probes; + for (const GSList *l = dev_inst->dev_inst()->channels; l; l = l->next) { - const sr_probe *const probe = (const sr_probe *)l->data; - if (!probe->enabled) + const sr_channel *const channel = (const sr_channel *)l->data; + if (!channel->enabled) continue; - switch(probe->type) { - case SR_PROBE_LOGIC: - logic_probe_count++; + switch(channel->type) { + case SR_CHANNEL_LOGIC: + logic_channel_count++; break; } } @@ -344,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); } } @@ -361,26 +359,26 @@ void SigSession::update_signals(shared_ptr dev_inst) break; assert(dev_inst->dev_inst()); - for (const GSList *l = dev_inst->dev_inst()->probes; + for (const GSList *l = dev_inst->dev_inst()->channels; l; l = l->next) { shared_ptr signal; - sr_probe *const probe = (sr_probe *)l->data; - assert(probe); + sr_channel *const channel = (sr_channel *)l->data; + assert(channel); - switch(probe->type) { - case SR_PROBE_LOGIC: + switch(channel->type) { + case SR_CHANNEL_LOGIC: signal = shared_ptr( new view::LogicSignal(dev_inst, - probe, _logic_data)); + channel, _logic_data)); break; - case SR_PROBE_ANALOG: + case SR_CHANNEL_ANALOG: { shared_ptr data( new data::Analog()); signal = shared_ptr( new view::AnalogSignal(dev_inst, - probe, data)); + channel, data)); break; } @@ -398,13 +396,13 @@ void SigSession::update_signals(shared_ptr dev_inst) signals_changed(); } -shared_ptr SigSession::signal_from_probe( - const sr_probe *probe) const +shared_ptr SigSession::signal_from_channel( + const sr_channel *channel) const { lock_guard lock(_signals_mutex); - BOOST_FOREACH(shared_ptr sig, _signals) { + for (shared_ptr sig : _signals) { assert(sig); - if (sig->probe() == probe) + if (sig->channel() == channel) return sig; } return shared_ptr(); @@ -431,7 +429,7 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi) // Set the sample rate of all data const set< shared_ptr > data_set = get_data(); - BOOST_FOREACH(shared_ptr data, data_set) { + for (shared_ptr data : data_set) { assert(data); data->set_samplerate(sample_rate); } @@ -453,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(); @@ -531,28 +529,28 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic) _cur_logic_snapshot->append_payload(logic); } - data_updated(); + data_received(); } void SigSession::feed_in_analog(const sr_datafeed_analog &analog) { lock_guard lock(_data_mutex); - const unsigned int probe_count = g_slist_length(analog.probes); - 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; - for (GSList *p = analog.probes; p; p = p->next) + for (GSList *p = analog.channels; p; p = p->next) { shared_ptr snapshot; - sr_probe *const probe = (sr_probe*)p->data; - assert(probe); + sr_channel *const channel = (sr_channel*)p->data; + assert(channel); - // Try to get the snapshot of the probe - const map< const sr_probe*, shared_ptr >:: - iterator iter = _cur_analog_snapshots.find(probe); + // Try to get the snapshot of the channel + const map< const sr_channel*, shared_ptr >:: + iterator iter = _cur_analog_snapshots.find(channel); if (iter != _cur_analog_snapshots.end()) snapshot = (*iter).second; else @@ -562,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()); @@ -584,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) { @@ -592,7 +590,7 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) set_capture_state(Running); } - data_updated(); + data_received(); } void SigSession::data_feed_in(const struct sr_dev_inst *sdi, @@ -633,9 +631,11 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, _cur_logic_snapshot.reset(); _cur_analog_snapshots.clear(); } - data_updated(); + frame_ended(); break; } + default: + break; } }