#include "sigsession.h"
#include "devicemanager.h"
+#include "device/devinst.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
SigSession::SigSession(DeviceManager &device_manager) :
_device_manager(device_manager),
- _sdi(NULL),
_capture_state(Stopped)
{
// TODO: This should not be necessary
{
stop_capture();
- _sampling_thread.join();
+ if (_sampling_thread.joinable())
+ _sampling_thread.join();
- if (_sdi)
- _device_manager.release_device(_sdi);
- _sdi = NULL;
+ if (_dev_inst)
+ _device_manager.release_device(_dev_inst);
// TODO: This should not be necessary
_session = NULL;
}
-struct sr_dev_inst* SigSession::get_device() const
+shared_ptr<device::DevInst> SigSession::get_device() const
{
- return _sdi;
+ return _dev_inst;
}
-void SigSession::set_device(struct sr_dev_inst *sdi)
+void SigSession::set_device(shared_ptr<device::DevInst> dev_inst)
{
// Ensure we are not capturing before setting the device
stop_capture();
- if (_sdi)
- _device_manager.release_device(_sdi);
- if (sdi)
- _device_manager.use_device(sdi, this);
- _sdi = sdi;
- update_signals(sdi);
+ if (_dev_inst)
+ _device_manager.release_device(_dev_inst);
+ if (dev_inst)
+ _device_manager.use_device(dev_inst, this);
+ _dev_inst = dev_inst;
+ update_signals(dev_inst);
}
-void SigSession::release_device(struct sr_dev_inst *sdi)
+void SigSession::release_device(shared_ptr<device::DevInst> dev_inst)
{
- (void)sdi;
+ (void)dev_inst;
assert(_capture_state == Stopped);
- _sdi = NULL;
- update_signals(NULL);
+ _dev_inst = shared_ptr<device::DevInst>();
}
void SigSession::load_file(const string &name,
return;
}
- sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
+ shared_ptr<device::DevInst> dev_inst(
+ new device::DevInst((sr_dev_inst*)devlist->data));
g_slist_free(devlist);
_decode_traces.clear();
- update_signals(sdi);
- read_sample_rate(sdi);
+ update_signals(dev_inst);
+ read_sample_rate(dev_inst->dev_inst());
_sampling_thread = boost::thread(
&SigSession::load_session_thread_proc, this,
return;
_decode_traces.clear();
- update_signals(in->sdi);
+ update_signals(shared_ptr<device::DevInst>(
+ new device::DevInst(in->sdi)));
read_sample_rate(in->sdi);
_sampling_thread = boost::thread(
return _capture_state;
}
-void SigSession::start_capture(uint64_t record_length,
- function<void (const QString)> error_handler)
+void SigSession::start_capture(function<void (const QString)> error_handler)
{
stop_capture();
// Check that a device instance has been selected.
- if (!_sdi) {
+ if (!_dev_inst) {
qDebug() << "No device selected";
return;
}
+ assert(_dev_inst->dev_inst());
+
// Check that at least one probe is enabled
const GSList *l;
- for (l = _sdi->probes; l; l = l->next) {
+ for (l = _dev_inst->dev_inst()->probes; l; l = l->next) {
sr_probe *const probe = (sr_probe*)l->data;
assert(probe);
if (probe->enabled)
// Begin the session
_sampling_thread = boost::thread(
- &SigSession::sample_thread_proc, this, _sdi,
- record_length, error_handler);
+ &SigSession::sample_thread_proc, this, _dev_inst,
+ error_handler);
}
void SigSession::stop_capture()
sr_session_stop();
// Check that sampling stopped
- _sampling_thread.join();
+ if (_sampling_thread.joinable())
+ _sampling_thread.join();
}
set< shared_ptr<data::SignalData> > SigSession::get_data() const
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(dec));
- // Auto select the initial probes
+ // Make a list of all the probes
+ std::vector<const srd_probe*> all_probes;
for(const GSList *i = dec->probes; i; i = i->next)
- {
- const srd_probe *const probe = (const srd_probe*)i->data;
+ 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);
+
+ // Auto select the initial probes
+ BOOST_FOREACH(const srd_probe *probe, all_probes)
BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
{
shared_ptr<view::LogicSignal> l =
l->get_name().toLower()))
probes[probe] = l;
}
- }
assert(decoder_stack);
assert(!decoder_stack->stack().empty());
return in;
}
-void SigSession::update_signals(const sr_dev_inst *const sdi)
+void SigSession::update_signals(shared_ptr<device::DevInst> dev_inst)
{
+ assert(dev_inst);
assert(_capture_state == Stopped);
- shared_ptr<view::Signal> signal;
unsigned int logic_probe_count = 0;
- unsigned int analog_probe_count = 0;
// Clear the decode traces
_decode_traces.clear();
// Detect what data types we will receive
- if(sdi) {
- for (const GSList *l = sdi->probes; l; l = l->next) {
+ if(dev_inst) {
+ assert(dev_inst->dev_inst());
+ for (const GSList *l = dev_inst->dev_inst()->probes;
+ l; l = l->next) {
const sr_probe *const probe = (const sr_probe *)l->data;
if (!probe->enabled)
continue;
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<mutex> data_lock(_data_mutex);
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<mutex> 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<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);
+ if(!dev_inst)
+ break;
+
+ assert(dev_inst->dev_inst());
+ for (const GSList *l = dev_inst->dev_inst()->probes;
+ l; l = l->next) {
+ shared_ptr<view::Signal> signal;
+ sr_probe *const probe = (sr_probe *)l->data;
+ assert(probe);
+
+ switch(probe->type) {
+ case SR_PROBE_LOGIC:
+ signal = shared_ptr<view::Signal>(
+ new view::LogicSignal(dev_inst,
+ probe, _logic_data));
+ break;
+
+ case SR_PROBE_ANALOG:
+ {
+ shared_ptr<data::Analog> data(
+ new data::Analog());
+ signal = shared_ptr<view::Signal>(
+ new view::AnalogSignal(dev_inst,
+ probe, data));
+ break;
+ }
+
+ default:
+ assert(0);
+ break;
}
+
+ assert(signal);
+ _signals.push_back(signal);
}
- }
+
+ } while(0);
signals_changed();
}
bool SigSession::is_trigger_enabled() const
{
- assert(_sdi);
- for (const GSList *l = _sdi->probes; l; l = l->next) {
+ assert(_dev_inst);
+ assert(_dev_inst->dev_inst());
+ for (const GSList *l = _dev_inst->dev_inst()->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 false;
}
+shared_ptr<view::Signal> SigSession::signal_from_probe(
+ const sr_probe *probe) const
+{
+ lock_guard<mutex> lock(_signals_mutex);
+ BOOST_FOREACH(shared_ptr<view::Signal> sig, _signals) {
+ assert(sig);
+ if (sig->probe() == probe)
+ return sig;
+ }
+ return shared_ptr<view::Signal>();
+}
+
void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
{
GVariant *gvar;
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::SignalData> > data_set = get_data();
+ BOOST_FOREACH(shared_ptr<data::SignalData> data, data_set) {
+ assert(data);
+ data->set_samplerate(sample_rate);
+ }
}
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,
// 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,
+void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
function<void (const QString)> error_handler)
{
- assert(sdi);
+ assert(dev_inst);
+ assert(dev_inst->dev_inst());
assert(error_handler);
sr_session_new();
sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
- if (sr_session_dev_add(sdi) != SR_OK) {
+ if (sr_session_dev_add(dev_inst->dev_inst()) != SR_OK) {
error_handler(tr("Failed to use device."));
sr_session_destroy();
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;
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)
if (!_cur_logic_snapshot)
{
+ // This could be the first packet after a trigger
set_capture_state(Running);
// Create a new data snapshot
_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
- new data::LogicSnapshot(logic));
+ new data::LogicSnapshot(logic, _dev_inst->get_sample_limit()));
_logic_data->push_snapshot(_cur_logic_snapshot);
}
else
{
lock_guard<mutex> 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<data::AnalogSnapshot> snapshot;
- // Create a new data snapshot
- _cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
- 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<data::AnalogSnapshot> >::
+ 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<data::AnalogSnapshot>(
+ new data::AnalogSnapshot(_dev_inst->get_sample_limit()));
+ _cur_analog_snapshots[probe] = snapshot;
+
+ // Find the annalog data associated with the probe
+ shared_ptr<view::AnalogSignal> sig =
+ dynamic_pointer_cast<view::AnalogSignal>(
+ signal_from_probe(probe));
+ assert(sig);
+
+ shared_ptr<data::Analog> 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();
{
lock_guard<mutex> lock(_data_mutex);
_cur_logic_snapshot.reset();
- _cur_analog_snapshot.reset();
+ _cur_analog_snapshots.clear();
}
data_updated();
break;