X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=6f66be7c586be3958b6b08290829264e401997c3;hp=2e7be37f9fb499e85156bd8480330d80059e7b89;hb=f9101a91fc942a28515872ae6c7285973bd54b91;hpb=27e8df221014d1a8c7769866773e8dbb0486eea8 diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 2e7be37f..6f66be7c 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -1,7 +1,7 @@ /* * This file is part of the PulseView project. * - * Copyright (C) 2012 Joel Holdsworth + * Copyright (C) 2012-14 Joel Holdsworth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef ENABLE_DECODE #include +#endif #include "sigsession.h" @@ -45,8 +47,15 @@ #include -using namespace boost; -using namespace std; +using boost::dynamic_pointer_cast; +using boost::function; +using boost::lock_guard; +using boost::mutex; +using boost::shared_ptr; +using std::map; +using std::set; +using std::string; +using std::vector; namespace pv { @@ -83,6 +92,9 @@ struct sr_dev_inst* SigSession::get_device() const void SigSession::set_device(struct sr_dev_inst *sdi) { + // Ensure we are not capturing before setting the device + stop_capture(); + if (_sdi) _device_manager.release_device(_sdi); if (sdi) @@ -149,8 +161,7 @@ SigSession::capture_state SigSession::get_capture_state() const return _capture_state; } -void SigSession::start_capture(uint64_t record_length, - function error_handler) +void SigSession::start_capture(function error_handler) { stop_capture(); @@ -176,8 +187,7 @@ void SigSession::start_capture(uint64_t record_length, // Begin the session _sampling_thread = boost::thread( - &SigSession::sample_thread_proc, this, _sdi, - record_length, error_handler); + &SigSession::sample_thread_proc, this, _sdi, error_handler); } void SigSession::stop_capture() @@ -191,17 +201,25 @@ void SigSession::stop_capture() _sampling_thread.join(); } -vector< shared_ptr > SigSession::get_signals() const +set< shared_ptr > SigSession::get_data() const { lock_guard lock(_signals_mutex); - return _signals; + set< shared_ptr > data; + BOOST_FOREACH(const shared_ptr sig, _signals) { + assert(sig); + data.insert(sig->data()); + } + + return data; } -boost::shared_ptr SigSession::get_data() +vector< shared_ptr > SigSession::get_signals() const { - return _logic_data; + lock_guard lock(_signals_mutex); + return _signals; } +#ifdef ENABLE_DECODE bool SigSession::add_decoder(srd_decoder *const dec) { map > probes; @@ -273,6 +291,7 @@ void SigSession::remove_decode_signal(view::DecodeTrace *signal) return; } } +#endif void SigSession::set_capture_state(capture_state state) { @@ -363,9 +382,7 @@ void SigSession::update_signals(const sr_dev_inst *const sdi) { assert(_capture_state == Stopped); - shared_ptr signal; unsigned int logic_probe_count = 0; - unsigned int analog_probe_count = 0; // Clear the decode traces _decode_traces.clear(); @@ -381,15 +398,11 @@ void SigSession::update_signals(const sr_dev_inst *const sdi) case SR_PROBE_LOGIC: logic_probe_count++; break; - - case SR_PROBE_ANALOG: - analog_probe_count++; - break; } } } - // Create data containers for the data snapshots + // Create data containers for the logic data snapshots { lock_guard data_lock(_data_mutex); @@ -399,43 +412,49 @@ void SigSession::update_signals(const sr_dev_inst *const sdi) logic_probe_count)); assert(_logic_data); } - - _analog_data.reset(); - if (analog_probe_count != 0) { - _analog_data.reset(new data::Analog()); - assert(_analog_data); - } } // Make the Signals list - { + do { lock_guard lock(_signals_mutex); _signals.clear(); - if(sdi) { - for (const GSList *l = sdi->probes; l; l = l->next) { - sr_probe *const probe = (sr_probe *)l->data; - assert(probe); - - switch(probe->type) { - case SR_PROBE_LOGIC: - signal = shared_ptr( - new view::LogicSignal(*this, probe, - _logic_data)); - break; - - case SR_PROBE_ANALOG: - signal = shared_ptr( - new view::AnalogSignal(*this, probe, - _analog_data)); - break; - } - - _signals.push_back(signal); + if(!sdi) + break; + + for (const GSList *l = sdi->probes; l; l = l->next) { + shared_ptr signal; + sr_probe *const probe = (sr_probe *)l->data; + assert(probe); + + switch(probe->type) { + case SR_PROBE_LOGIC: + signal = shared_ptr( + new view::LogicSignal(*this, probe, + _logic_data)); + break; + + case SR_PROBE_ANALOG: + { + shared_ptr data( + new data::Analog()); + signal = shared_ptr( + new view::AnalogSignal(*this, probe, + data)); + break; } + + default: + assert(0); + break; + } + + assert(signal); + _signals.push_back(signal); } - } + + } while(0); signals_changed(); } @@ -453,6 +472,18 @@ bool SigSession::is_trigger_enabled() const return false; } +shared_ptr SigSession::signal_from_probe( + const sr_probe *probe) const +{ + lock_guard lock(_signals_mutex); + BOOST_FOREACH(shared_ptr sig, _signals) { + assert(sig); + if (sig->probe() == probe) + return sig; + } + return shared_ptr(); +} + void SigSession::read_sample_rate(const sr_dev_inst *const sdi) { GVariant *gvar; @@ -472,10 +503,12 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi) g_variant_unref(gvar); } - if(_analog_data) - _analog_data->set_samplerate(sample_rate); - if(_logic_data) - _logic_data->set_samplerate(sample_rate); + // Set the sample rate of all data + const set< shared_ptr > data_set = get_data(); + BOOST_FOREACH(shared_ptr data, data_set) { + assert(data); + data->set_samplerate(sample_rate); + } } void SigSession::load_session_thread_proc( @@ -494,7 +527,7 @@ void SigSession::load_session_thread_proc( // Confirm that SR_DF_END was received assert(!_cur_logic_snapshot); - assert(!_cur_analog_snapshot); + assert(_cur_analog_snapshots.empty()); } void SigSession::load_input_thread_proc(const string name, @@ -516,13 +549,12 @@ void SigSession::load_input_thread_proc(const string name, // Confirm that SR_DF_END was received assert(!_cur_logic_snapshot); - assert(!_cur_analog_snapshot); + assert(_cur_analog_snapshots.empty()); delete in; } void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, - uint64_t record_length, function error_handler) { assert(sdi); @@ -537,15 +569,6 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, return; } - // Set the sample limit - if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_SAMPLES, - g_variant_new_uint64(record_length)) != SR_OK) { - error_handler(tr("Failed to configure " - "time-based sample limit.")); - sr_session_destroy(); - return; - } - if (sr_session_start() != SR_OK) { error_handler(tr("Failed to start session.")); return; @@ -559,8 +582,11 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, set_capture_state(Stopped); // Confirm that SR_DF_END was received - assert(!_cur_logic_snapshot); - assert(!_cur_analog_snapshot); + if (_cur_logic_snapshot) + { + qDebug("SR_DF_END was not received."); + assert(0); + } } void SigSession::feed_in_header(const sr_dev_inst *sdi) @@ -601,6 +627,7 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic) if (!_cur_logic_snapshot) { + // This could be the first packet after a trigger set_capture_state(Running); // Create a new data snapshot @@ -621,25 +648,58 @@ void SigSession::feed_in_analog(const sr_datafeed_analog &analog) { lock_guard lock(_data_mutex); - if(!_analog_data) - { - qDebug() << "Unexpected analog packet"; - return; // This analog packet was not expected. - } + const unsigned int probe_count = g_slist_length(analog.probes); + const size_t sample_count = analog.num_samples / probe_count; + const float *data = analog.data; + bool sweep_beginning = false; - if (!_cur_analog_snapshot) + for (GSList *p = analog.probes; p; p = p->next) { - set_capture_state(Running); + shared_ptr snapshot; - // Create a new data snapshot - _cur_analog_snapshot = shared_ptr( - new data::AnalogSnapshot(analog)); - _analog_data->push_snapshot(_cur_analog_snapshot); + sr_probe *const probe = (sr_probe*)p->data; + assert(probe); + + // Try to get the snapshot of the probe + const map< const sr_probe*, shared_ptr >:: + iterator iter = _cur_analog_snapshots.find(probe); + if (iter != _cur_analog_snapshots.end()) + snapshot = (*iter).second; + else + { + // If no snapshot was found, this means we havn't + // created one yet. i.e. this is the first packet + // in the sweep containing this snapshot. + sweep_beginning = true; + + // Create a snapshot, keep it in the maps of probes + snapshot = shared_ptr( + new data::AnalogSnapshot()); + _cur_analog_snapshots[probe] = snapshot; + + // Find the annalog data associated with the probe + shared_ptr sig = + dynamic_pointer_cast( + signal_from_probe(probe)); + assert(sig); + + shared_ptr data(sig->analog_data()); + assert(data); + + // Push the snapshot into the analog data. + data->push_snapshot(snapshot); + } + + assert(snapshot); + + // Append the samples in the snapshot + snapshot->append_interleaved_samples(data++, sample_count, + probe_count); } - else - { - // Append to the existing data snapshot - _cur_analog_snapshot->append_payload(analog); + + if (sweep_beginning) { + // This could be the first packet after a trigger + set_capture_state(Running); } data_updated(); @@ -677,7 +737,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi, { lock_guard lock(_data_mutex); _cur_logic_snapshot.reset(); - _cur_analog_snapshot.reset(); + _cur_analog_snapshots.clear(); } data_updated(); break;