_sampling_thread->join();
_sampling_thread.reset();
+ if (_sdi)
+ _device_manager.release_device(_sdi);
+ _sdi = NULL;
+
// TODO: This should not be necessary
_session = NULL;
}
if (sdi)
_device_manager.use_device(sdi, this);
_sdi = sdi;
+ update_signals(sdi);
}
void SigSession::release_device(struct sr_dev_inst *sdi)
assert(_capture_state == Stopped);
_sdi = NULL;
+ update_signals(NULL);
}
void SigSession::load_file(const string &name,
function<void (const QString)> error_handler)
{
stop_capture();
- _sampling_thread.reset(new boost::thread(
- &SigSession::load_thread_proc, this, name,
- error_handler));
+
+ if (sr_session_load(name.c_str()) == SR_OK) {
+ GSList *devlist = NULL;
+ sr_session_dev_list(&devlist);
+
+ if (!devlist || !devlist->data ||
+ sr_session_start() != SR_OK) {
+ error_handler(tr("Failed to start session."));
+ return;
+ }
+
+ sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
+ g_slist_free(devlist);
+
+ update_signals(sdi);
+ read_sample_rate(sdi);
+
+ _sampling_thread.reset(new boost::thread(
+ &SigSession::load_session_thread_proc, this,
+ error_handler));
+
+ } else {
+ sr_input *in = NULL;
+
+ if (!(in = load_input_file_format(name.c_str(),
+ error_handler)))
+ return;
+
+ update_signals(in->sdi);
+ read_sample_rate(in->sdi);
+
+ _sampling_thread.reset(new boost::thread(
+ &SigSession::load_input_thread_proc, this,
+ name, in, error_handler));
+ }
+
}
SigSession::capture_state SigSession::get_capture_state() const
void SigSession::set_capture_state(capture_state state)
{
lock_guard<mutex> lock(_sampling_mutex);
+ const bool changed = _capture_state != state;
_capture_state = state;
- capture_state_changed(state);
+ if(changed)
+ capture_state_changed(state);
}
/**
return in;
}
-void SigSession::load_thread_proc(const string name,
- function<void (const QString)> error_handler)
+void SigSession::update_signals(const sr_dev_inst *const sdi)
{
- sr_input *in = NULL;
+ assert(_capture_state == Stopped);
- if (sr_session_load(name.c_str()) == SR_OK) {
- if (sr_session_start() != SR_OK) {
- error_handler(tr("Failed to start session."));
+ shared_ptr<view::Signal> signal;
+ unsigned int logic_probe_count = 0;
+ unsigned int analog_probe_count = 0;
+
+ // Detect what data types we will receive
+ if(sdi) {
+ for (const GSList *l = sdi->probes; l; l = l->next) {
+ const sr_probe *const probe = (const sr_probe *)l->data;
+ if (!probe->enabled)
+ continue;
+
+ switch(probe->type) {
+ case SR_PROBE_LOGIC:
+ logic_probe_count++;
+ break;
+
+ case SR_PROBE_ANALOG:
+ analog_probe_count++;
+ break;
+ }
+ }
+ }
+
+ // Create data containers for the data snapshots
+ {
+ lock_guard<mutex> data_lock(_data_mutex);
+
+ _logic_data.reset();
+ if (logic_probe_count != 0) {
+ _logic_data.reset(new data::Logic(
+ 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
+ {
+ lock_guard<mutex> lock(_signals_mutex);
+
+ _signals.clear();
+
+ if(sdi) {
+ for (const GSList *l = sdi->probes; l; l = l->next) {
+ const sr_probe *const probe =
+ (const sr_probe *)l->data;
+ assert(probe);
+
+ switch(probe->type) {
+ case SR_PROBE_LOGIC:
+ signal = shared_ptr<view::Signal>(
+ new view::LogicSignal(*this, probe,
+ _logic_data));
+ break;
+
+ case SR_PROBE_ANALOG:
+ signal = shared_ptr<view::Signal>(
+ new view::AnalogSignal(*this, probe,
+ _analog_data));
+ break;
+ }
+
+ _signals.push_back(signal);
+ }
+ }
+ }
+
+ signals_changed();
+}
+
+bool SigSession::is_trigger_enabled() const
+{
+ assert(_sdi);
+ for (const GSList *l = _sdi->probes; l; l = l->next) {
+ const sr_probe *const p = (const sr_probe *)l->data;
+ assert(p);
+ if (p->trigger && p->trigger[0] != '\0')
+ return true;
+ }
+
+ return false;
+}
+
+void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
+{
+ GVariant *gvar;
+ uint64_t sample_rate = 0;
+
+ // Read out the sample rate
+ if(sdi->driver)
+ {
+ const int ret = sr_config_get(sdi->driver,
+ SR_CONF_SAMPLERATE, &gvar, sdi);
+ if (ret != SR_OK) {
+ qDebug("Failed to get samplerate\n");
return;
}
+
+ sample_rate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
}
- else if(!(in = load_input_file_format(name.c_str(), error_handler)))
- return;
+
+ if(_analog_data)
+ _analog_data->set_samplerate(sample_rate);
+ if(_logic_data)
+ _logic_data->set_samplerate(sample_rate);
+}
+
+void SigSession::load_session_thread_proc(
+ function<void (const QString)> error_handler)
+{
+ (void)error_handler;
sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
set_capture_state(Running);
- if(in) {
- assert(in->format);
- in->format->loadfile(in, name.c_str());
- } else
- sr_session_run();
+ sr_session_run();
+
+ sr_session_destroy();
+ set_capture_state(Stopped);
+
+ // Confirm that SR_DF_END was received
+ assert(!_cur_logic_snapshot);
+ assert(!_cur_analog_snapshot);
+}
+
+void SigSession::load_input_thread_proc(const string name,
+ sr_input *in, function<void (const QString)> error_handler)
+{
+ (void)error_handler;
+
+ assert(in);
+ assert(in->format);
+
+ sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+
+ set_capture_state(Running);
+
+ in->format->loadfile(in, name.c_str());
sr_session_destroy();
set_capture_state(Stopped);
return;
}
- set_capture_state(Running);
+ set_capture_state(is_trigger_enabled() ? AwaitingTrigger : Running);
sr_session_run();
sr_session_destroy();
void SigSession::feed_in_header(const sr_dev_inst *sdi)
{
- shared_ptr<view::Signal> signal;
- GVariant *gvar;
- uint64_t sample_rate = 0;
- unsigned int logic_probe_count = 0;
- unsigned int analog_probe_count = 0;
-
- // Detect what data types we will receive
- for (const GSList *l = sdi->probes; l; l = l->next) {
- const sr_probe *const probe = (const sr_probe *)l->data;
- if (!probe->enabled)
- continue;
-
- switch(probe->type) {
- case SR_PROBE_LOGIC:
- logic_probe_count++;
- break;
-
- case SR_PROBE_ANALOG:
- analog_probe_count++;
- break;
- }
- }
-
- // Read out the sample rate
- if(sdi->driver)
- {
- const int ret = sr_config_get(sdi->driver,
- SR_CONF_SAMPLERATE, &gvar, sdi);
- if (ret != SR_OK) {
- qDebug("Failed to get samplerate\n");
- return;
- }
-
- sample_rate = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
- }
-
- // Create data containers for the coming data snapshots
- {
- lock_guard<mutex> data_lock(_data_mutex);
-
- if (logic_probe_count != 0) {
- _logic_data.reset(new data::Logic(
- logic_probe_count, sample_rate));
- assert(_logic_data);
- }
-
- if (analog_probe_count != 0) {
- _analog_data.reset(new data::Analog(sample_rate));
- assert(_analog_data);
- }
- }
-
- // Make the logic probe list
- {
- lock_guard<mutex> lock(_signals_mutex);
-
- _signals.clear();
-
- for (const GSList *l = sdi->probes; l; l = l->next) {
- const sr_probe *const probe =
- (const sr_probe *)l->data;
- assert(probe);
- if (!probe->enabled)
- continue;
-
- switch(probe->type) {
- case SR_PROBE_LOGIC:
- signal = shared_ptr<view::Signal>(
- new view::LogicSignal(probe->name,
- _logic_data, probe->index));
- break;
-
- case SR_PROBE_ANALOG:
- signal = shared_ptr<view::Signal>(
- new view::AnalogSignal(probe->name,
- _analog_data, probe->index));
- break;
- }
-
- _signals.push_back(signal);
- }
-
- signals_changed();
- }
+ read_sample_rate(sdi);
}
void SigSession::feed_in_meta(const sr_dev_inst *sdi,
if (!_cur_logic_snapshot)
{
+ set_capture_state(Running);
+
// Create a new data snapshot
_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
new data::LogicSnapshot(logic));
if (!_cur_analog_snapshot)
{
+ set_capture_state(Running);
+
// Create a new data snapshot
_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
new data::AnalogSnapshot(analog));