X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=94867959f184fcb547b40463e84f97fccbfea5f6;hp=5b9630631a1fe9c1e104e9f8437745c49d2c61ba;hb=4d5d5d6aeb7d936fb6b939f6c6531b3f054dac1f;hpb=eec446e1588c41eb14de5e21a8383d10653c15bd diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp index 5b963063..94867959 100644 --- a/pv/sigsession.cpp +++ b/pv/sigsession.cpp @@ -27,10 +27,10 @@ #include "view/analogsignal.h" #include "view/logicsignal.h" -#include - #include +#include + using namespace boost; using namespace std; @@ -58,11 +58,13 @@ SigSession::~SigSession() _session = NULL; } -void SigSession::load_file(const string &name) +void SigSession::load_file(const string &name, + function error_handler) { stop_capture(); _sampling_thread.reset(new boost::thread( - &SigSession::load_thread_proc, this, name)); + &SigSession::load_thread_proc, this, name, + error_handler)); } SigSession::capture_state SigSession::get_capture_state() const @@ -72,16 +74,29 @@ SigSession::capture_state SigSession::get_capture_state() const } void SigSession::start_capture(struct sr_dev_inst *sdi, - uint64_t record_length, uint64_t sample_rate) + uint64_t record_length, + function error_handler) { stop_capture(); - lock_guard lock(_sampling_mutex); - _sample_rate = sample_rate; + // Check that at least one probe is enabled + const GSList *l; + for (l = sdi->probes; l; l = l->next) { + sr_probe *const probe = (sr_probe*)l->data; + assert(probe); + if (probe->enabled) + break; + } + if (!l) { + error_handler(tr("No probes enabled.")); + return; + } + + // Begin the session _sampling_thread.reset(new boost::thread( &SigSession::sample_thread_proc, this, sdi, - record_length)); + record_length, error_handler)); } void SigSession::stop_capture() @@ -115,17 +130,18 @@ void SigSession::set_capture_state(capture_state state) capture_state_changed(state); } -void SigSession::load_thread_proc(const string name) +void SigSession::load_thread_proc(const string name, + function error_handler) { if (sr_session_load(name.c_str()) != SR_OK) { - qDebug() << "Failed to load file."; + error_handler(tr("Failed to load file.")); return; } sr_session_datafeed_callback_add(data_feed_in_proc); if (sr_session_start() != SR_OK) { - qDebug() << "Failed to start session."; + error_handler(tr("Failed to start session.")); return; } @@ -138,40 +154,32 @@ void SigSession::load_thread_proc(const string name) } void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, - uint64_t record_length) + uint64_t record_length, + function error_handler) { assert(sdi); + assert(error_handler); sr_session_new(); sr_session_datafeed_callback_add(data_feed_in_proc); if (sr_session_dev_add(sdi) != SR_OK) { - qDebug() << "Failed to use device."; + error_handler(tr("Failed to use device.")); sr_session_destroy(); return; } // Set the sample limit if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES, - &record_length) != SR_OK) { - qDebug() << "Failed to configure time-based sample limit."; + g_variant_new_uint64(record_length)) != SR_OK) { + error_handler(tr("Failed to configure " + "time-based sample limit.")); sr_session_destroy(); return; } - // Set the samplerate - { - lock_guard lock(_sampling_mutex); - if (sr_config_set(sdi, SR_CONF_SAMPLERATE, - &_sample_rate) != SR_OK) { - qDebug() << "Failed to configure samplerate."; - sr_session_destroy(); - return; - } - } - if (sr_session_start() != SR_OK) { - qDebug() << "Failed to start session."; + error_handler(tr("Failed to start session.")); return; } @@ -186,6 +194,8 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi, void SigSession::feed_in_header(const sr_dev_inst *sdi) { shared_ptr signal; + GVariant *gvar; + uint64_t sample_rate = 0; unsigned int logic_probe_count = 0; unsigned int analog_probe_count = 0; @@ -206,19 +216,27 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi) } } + // Read out the sample rate + assert(sdi->driver); + + const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE, + &gvar, sdi); + assert(ret == SR_OK); + sample_rate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); + // Create data containers for the coming data snapshots { lock_guard data_lock(_data_mutex); - lock_guard sampling_lock(_sampling_mutex); if (logic_probe_count != 0) { _logic_data.reset(new data::Logic( - logic_probe_count, _sample_rate)); + logic_probe_count, sample_rate)); assert(_logic_data); } if (analog_probe_count != 0) { - _analog_data.reset(new data::Analog(_sample_rate)); + _analog_data.reset(new data::Analog(sample_rate)); assert(_analog_data); } } @@ -246,7 +264,7 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi) case SR_PROBE_ANALOG: signal = shared_ptr( new view::AnalogSignal(probe->name, - _analog_data)); + _analog_data, probe->index)); break; } @@ -260,6 +278,8 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi) void SigSession::feed_in_meta(const sr_dev_inst *sdi, const sr_datafeed_meta &meta) { + (void)sdi; + for (const GSList *l = meta.config; l; l = l->next) { const sr_config *const src = (const sr_config*)l->data; switch (src->key) { @@ -277,10 +297,15 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi, void SigSession::feed_in_logic(const sr_datafeed_logic &logic) { lock_guard lock(_data_mutex); - if (!_cur_logic_snapshot) + + if (!_logic_data) { - assert(_logic_data); + qDebug() << "Unexpected logic packet"; + return; + } + if (!_cur_logic_snapshot) + { // Create a new data snapshot _cur_logic_snapshot = shared_ptr( new data::LogicSnapshot(logic)); @@ -298,10 +323,15 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic) void SigSession::feed_in_analog(const sr_datafeed_analog &analog) { lock_guard lock(_data_mutex); - if (!_cur_analog_snapshot) + + if(!_analog_data) { - assert(_analog_data); + qDebug() << "Unexpected analog packet"; + return; // This analog packet was not expected. + } + if (!_cur_analog_snapshot) + { // Create a new data snapshot _cur_analog_snapshot = shared_ptr( new data::AnalogSnapshot(analog));