#include "sigsession.h"
#include "devicemanager.h"
-#include "device/device.h"
-#include "device/file.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
#include "view/decodetrace.h"
#include "view/logicsignal.h"
-#include <assert.h>
-
+#include <cassert>
+#include <mutex>
#include <stdexcept>
-#include <boost/foreach.hpp>
-
#include <sys/stat.h>
#include <QDebug>
-using boost::dynamic_pointer_cast;
-using boost::function;
-using boost::lock_guard;
-using boost::mutex;
-using boost::shared_ptr;
+#include <libsigrok/libsigrok.hpp>
+
+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;
-namespace pv {
-
-// TODO: This should not be necessary
-SigSession* SigSession::_session = NULL;
+using sigrok::Analog;
+using sigrok::Channel;
+using sigrok::ChannelType;
+using sigrok::ConfigKey;
+using sigrok::DatafeedCallbackFunction;
+using sigrok::Device;
+using sigrok::Error;
+using sigrok::HardwareDevice;
+using sigrok::Header;
+using sigrok::Logic;
+using sigrok::Meta;
+using sigrok::Packet;
+using sigrok::PacketPayload;
+using sigrok::Session;
+using sigrok::SessionDevice;
+
+using Glib::VariantBase;
+using Glib::Variant;
+namespace pv {
SigSession::SigSession(DeviceManager &device_manager) :
_device_manager(device_manager),
+ _session(device_manager.context()->create_session()),
_capture_state(Stopped)
{
- // TODO: This should not be necessary
- _session = this;
-
set_default_device();
}
SigSession::~SigSession()
{
- using pv::device::Device;
-
+ // Stop and join to the thread
stop_capture();
-
- if (_sampling_thread.joinable())
- _sampling_thread.join();
-
- _dev_inst->release();
-
- // TODO: This should not be necessary
- _session = NULL;
}
-shared_ptr<device::DevInst> SigSession::get_device() const
+const shared_ptr<sigrok::Session>& SigSession::session() const
{
- return _dev_inst;
+ return _session;
}
-void SigSession::set_device(
- shared_ptr<device::DevInst> dev_inst) throw(QString)
+shared_ptr<Device> SigSession::device() const
{
- using pv::device::Device;
+ return _device;
+}
+void SigSession::set_device(shared_ptr<Device> device)
+{
// Ensure we are not capturing before setting the device
stop_capture();
- if (_dev_inst) {
- sr_session_datafeed_callback_remove_all();
- _dev_inst->release();
+ // Are we setting a session device?
+ auto session_device = dynamic_pointer_cast<SessionDevice>(device);
+ // Did we have a session device selected previously?
+ auto prev_session_device = dynamic_pointer_cast<SessionDevice>(_device);
+
+ if (_device) {
+ _session->remove_datafeed_callbacks();
+ if (!prev_session_device) {
+ _device->close();
+ _session->remove_devices();
+ }
}
- _dev_inst = dev_inst;
+ if (session_device)
+ _session = session_device->parent();
+
+ _device = device;
_decode_traces.clear();
- if (dev_inst) {
- dev_inst->use(this);
- sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
- update_signals(dev_inst);
+ if (device) {
+ if (!session_device)
+ {
+ _session = _device_manager.context()->create_session();
+ device->open();
+ _session->add_device(device);
+ }
+ _session->add_datafeed_callback([=]
+ (shared_ptr<Device> device, shared_ptr<Packet> packet) {
+ data_feed_in(device, packet);
+ });
+ update_signals(device);
}
}
-void SigSession::set_file(const string &name) throw(QString)
+void SigSession::set_file(const string &name)
{
- // Deslect the old device, because file type detection in File::create
- // destorys the old session inside libsigrok.
- set_device(shared_ptr<device::DevInst>());
- set_device(shared_ptr<device::DevInst>(device::File::create(name)));
+ _session = _device_manager.context()->load_session(name);
+ _device = _session->devices()[0];
+ _decode_traces.clear();
+ _session->add_datafeed_callback([=]
+ (shared_ptr<Device> device, shared_ptr<Packet> packet) {
+ data_feed_in(device, packet);
+ });
+ _device_manager.update_display_name(_device);
+ update_signals(_device);
}
-void SigSession::release_device(device::DevInst *dev_inst)
+void SigSession::set_default_device()
{
- (void)dev_inst;
- assert(_dev_inst.get() == dev_inst);
+ shared_ptr<HardwareDevice> default_device;
+ const list< shared_ptr<HardwareDevice> > &devices =
+ _device_manager.devices();
- assert(_capture_state == Stopped);
- _dev_inst = shared_ptr<device::DevInst>();
+ 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<HardwareDevice> dev : devices)
+ if (dev->driver()->name().compare("demo") == 0) {
+ default_device = dev;
+ break;
+ }
+
+ set_device(default_device);
+ }
}
SigSession::capture_state SigSession::get_capture_state() const
stop_capture();
// Check that a device instance has been selected.
- if (!_dev_inst) {
+ if (!_device) {
qDebug() << "No device selected";
return;
}
- assert(_dev_inst->dev_inst());
+ // Check that at least one channel is enabled
+ auto channels = _device->channels();
+ bool enabled = std::any_of(channels.begin(), channels.end(),
+ [](shared_ptr<Channel> channel) { return channel->enabled(); });
- // Check that at least one probe 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)
- break;
- }
-
- if (!l) {
- error_handler(tr("No probes enabled."));
+ if (!enabled) {
+ error_handler(tr("No channels enabled."));
return;
}
// Begin the session
- _sampling_thread = boost::thread(
- &SigSession::sample_thread_proc, this, _dev_inst,
+ _sampling_thread = std::thread(
+ &SigSession::sample_thread_proc, this, _device,
error_handler);
}
void SigSession::stop_capture()
{
- if (get_capture_state() == Stopped)
- return;
-
- sr_session_stop();
+ if (get_capture_state() != Stopped)
+ _session->stop();
// Check that sampling stopped
if (_sampling_thread.joinable())
{
lock_guard<mutex> lock(_signals_mutex);
set< shared_ptr<data::SignalData> > data;
- BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+ for (const shared_ptr<view::Signal> sig : _signals) {
assert(sig);
data.insert(sig->data());
}
#ifdef ENABLE_DECODE
bool SigSession::add_decoder(srd_decoder *const dec)
{
- map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+ map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
shared_ptr<data::DecoderStack> decoder_stack;
try
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(*this, dec));
- // Make a list of all the probes
- std::vector<const srd_probe*> 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<const srd_channel*> 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<view::Signal> s, _signals)
+ // Auto select the initial channels
+ for (const srd_channel *pdch : all_channels)
+ for (shared_ptr<view::Signal> s : _signals)
{
shared_ptr<view::LogicSignal> l =
dynamic_pointer_cast<view::LogicSignal>(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<view::DecodeTrace> d(
void SigSession::remove_decode_signal(view::DecodeTrace *signal)
{
- for (vector< shared_ptr<view::DecodeTrace> >::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);
capture_state_changed(state);
}
-void SigSession::set_default_device()
+void SigSession::update_signals(shared_ptr<Device> device)
{
- shared_ptr<pv::device::DevInst> default_device;
- const list< shared_ptr<device::Device> > &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<pv::device::Device> 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<device::DevInst> dev_inst)
-{
- assert(dev_inst);
+ assert(device);
assert(_capture_state == Stopped);
- unsigned int logic_probe_count = 0;
-
// Clear the decode traces
_decode_traces.clear();
// Detect what data types we will receive
- 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;
-
- switch(probe->type) {
- case SR_PROBE_LOGIC:
- logic_probe_count++;
- break;
- }
- }
- }
+ auto channels = device->channels();
+ unsigned int logic_channel_count = std::count_if(
+ channels.begin(), channels.end(),
+ [] (shared_ptr<Channel> channel) {
+ return channel->type() == ChannelType::LOGIC; });
// Create data containers for the logic data snapshots
{
lock_guard<mutex> 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);
}
}
// Make the Signals list
- do {
+ {
lock_guard<mutex> lock(_signals_mutex);
_signals.clear();
- if(!dev_inst)
- break;
-
- assert(dev_inst->dev_inst());
- for (const GSList *l = dev_inst->dev_inst()->probes;
- l; l = l->next) {
+ for (auto channel : device->channels()) {
shared_ptr<view::Signal> signal;
- sr_probe *const probe = (sr_probe *)l->data;
- assert(probe);
- switch(probe->type) {
- case SR_PROBE_LOGIC:
+ switch(channel->type()->id()) {
+ case SR_CHANNEL_LOGIC:
signal = shared_ptr<view::Signal>(
- new view::LogicSignal(dev_inst,
- probe, _logic_data));
+ new view::LogicSignal(*this, device,
+ channel, _logic_data));
break;
- case SR_PROBE_ANALOG:
+ case SR_CHANNEL_ANALOG:
{
shared_ptr<data::Analog> data(
new data::Analog());
signal = shared_ptr<view::Signal>(
- new view::AnalogSignal(dev_inst,
- probe, data));
+ new view::AnalogSignal(
+ *this, channel, data));
break;
}
_signals.push_back(signal);
}
- } while(0);
+ }
signals_changed();
}
-shared_ptr<view::Signal> SigSession::signal_from_probe(
- const sr_probe *probe) const
+shared_ptr<view::Signal> SigSession::signal_from_channel(
+ shared_ptr<Channel> channel) const
{
lock_guard<mutex> lock(_signals_mutex);
- BOOST_FOREACH(shared_ptr<view::Signal> sig, _signals) {
+ for (shared_ptr<view::Signal> sig : _signals) {
assert(sig);
- if (sig->probe() == probe)
+ if (sig->channel() == channel)
return sig;
}
return shared_ptr<view::Signal>();
}
-void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
+void SigSession::read_sample_rate(shared_ptr<Device> device)
{
- GVariant *gvar;
- uint64_t sample_rate = 0;
-
- // Read out the sample rate
- if(sdi->driver)
- {
- const int ret = sr_config_get(sdi->driver, sdi, NULL,
- SR_CONF_SAMPLERATE, &gvar);
- if (ret != SR_OK) {
- qDebug("Failed to get samplerate\n");
- return;
- }
-
- sample_rate = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
- }
+ uint64_t sample_rate = VariantBase::cast_dynamic<Variant<guint64>>(
+ device->config_get(ConfigKey::SAMPLERATE)).get();
// 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) {
+ for (shared_ptr<data::SignalData> data : data_set) {
assert(data);
data->set_samplerate(sample_rate);
}
}
-void SigSession::sample_thread_proc(shared_ptr<device::DevInst> dev_inst,
+void SigSession::sample_thread_proc(shared_ptr<Device> device,
function<void (const QString)> error_handler)
{
- assert(dev_inst);
- assert(dev_inst->dev_inst());
+ assert(device);
assert(error_handler);
- read_sample_rate(dev_inst->dev_inst());
+ read_sample_rate(device);
try {
- dev_inst->start();
- } catch(const QString e) {
- error_handler(e);
+ _session->start();
+ } catch(Error e) {
+ error_handler(e.what());
return;
}
- set_capture_state(dev_inst->is_trigger_enabled() ?
+ set_capture_state(_session->trigger() ?
AwaitingTrigger : Running);
- dev_inst->run();
+ _session->run();
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
}
}
-void SigSession::feed_in_header(const sr_dev_inst *sdi)
+void SigSession::feed_in_header(shared_ptr<Device> device)
{
- read_sample_rate(sdi);
+ read_sample_rate(device);
}
-void SigSession::feed_in_meta(const sr_dev_inst *sdi,
- const sr_datafeed_meta &meta)
+void SigSession::feed_in_meta(shared_ptr<Device> device,
+ shared_ptr<Meta> meta)
{
- (void)sdi;
+ (void)device;
- for (const GSList *l = meta.config; l; l = l->next) {
- const sr_config *const src = (const sr_config*)l->data;
- switch (src->key) {
+ for (auto entry : meta->config()) {
+ switch (entry.first->id()) {
case SR_CONF_SAMPLERATE:
/// @todo handle samplerate changes
- /// samplerate = (uint64_t *)src->value;
break;
default:
// Unknown metadata is not an error.
signals_changed();
}
-void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
+void SigSession::feed_in_frame_begin()
+{
+ if (_cur_logic_snapshot || !_cur_analog_snapshots.empty())
+ frame_began();
+}
+
+void SigSession::feed_in_logic(shared_ptr<Logic> logic)
{
lock_guard<mutex> lock(_data_mutex);
// This could be the first packet after a trigger
set_capture_state(Running);
+ // Get sample limit.
+ uint64_t sample_limit;
+ try {
+ sample_limit = VariantBase::cast_dynamic<Variant<guint64>>(
+ _device->config_get(ConfigKey::LIMIT_SAMPLES)).get();
+ } catch (Error) {
+ sample_limit = 0;
+ }
+
// Create a new data snapshot
_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
- new data::LogicSnapshot(logic, _dev_inst->get_sample_limit()));
+ new data::LogicSnapshot(logic, sample_limit));
_logic_data->push_snapshot(_cur_logic_snapshot);
+
+ // @todo Putting this here means that only listeners querying
+ // for logic will be notified. Currently the only user of
+ // frame_began is DecoderStack, but in future we need to signal
+ // this after both analog and logic sweeps have begun.
+ frame_began();
}
else
{
_cur_logic_snapshot->append_payload(logic);
}
- data_updated();
+ data_received();
}
-void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
+void SigSession::feed_in_analog(shared_ptr<Analog> analog)
{
lock_guard<mutex> lock(_data_mutex);
- 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;
+ const vector<shared_ptr<Channel>> channels = analog->channels();
+ const unsigned int channel_count = channels.size();
+ const size_t sample_count = analog->num_samples() / channel_count;
+ const float *data = analog->data_pointer();
bool sweep_beginning = false;
- for (GSList *p = analog.probes; p; p = p->next)
+ for (auto channel : channels)
{
shared_ptr<data::AnalogSnapshot> 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);
+ // Try to get the snapshot of the channel
+ const map< shared_ptr<Channel>, shared_ptr<data::AnalogSnapshot> >::
+ iterator iter = _cur_analog_snapshots.find(channel);
if (iter != _cur_analog_snapshots.end())
snapshot = (*iter).second;
else
// in the sweep containing this snapshot.
sweep_beginning = true;
- // Create a snapshot, keep it in the maps of probes
+ // Get sample limit.
+ uint64_t sample_limit;
+ try {
+ sample_limit = VariantBase::cast_dynamic<Variant<guint64>>(
+ _device->config_get(ConfigKey::LIMIT_SAMPLES)).get();
+ } catch (Error) {
+ sample_limit = 0;
+ }
+
+ // Create a snapshot, keep it in the maps of channels
snapshot = shared_ptr<data::AnalogSnapshot>(
- new data::AnalogSnapshot(_dev_inst->get_sample_limit()));
- _cur_analog_snapshots[probe] = snapshot;
+ new data::AnalogSnapshot(sample_limit));
+ _cur_analog_snapshots[channel] = snapshot;
- // Find the annalog data associated with the probe
+ // Find the annalog data associated with the channel
shared_ptr<view::AnalogSignal> sig =
dynamic_pointer_cast<view::AnalogSignal>(
- signal_from_probe(probe));
+ signal_from_channel(channel));
assert(sig);
shared_ptr<data::Analog> data(sig->analog_data());
// Append the samples in the snapshot
snapshot->append_interleaved_samples(data++, sample_count,
- probe_count);
+ channel_count);
}
if (sweep_beginning) {
set_capture_state(Running);
}
- data_updated();
+ data_received();
}
-void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
- const struct sr_datafeed_packet *packet)
+void SigSession::data_feed_in(shared_ptr<Device> device, shared_ptr<Packet> packet)
{
- assert(sdi);
+ assert(device);
assert(packet);
- switch (packet->type) {
+ switch (packet->type()->id()) {
case SR_DF_HEADER:
- feed_in_header(sdi);
+ feed_in_header(device);
break;
case SR_DF_META:
- assert(packet->payload);
- feed_in_meta(sdi,
- *(const sr_datafeed_meta*)packet->payload);
+ feed_in_meta(device, dynamic_pointer_cast<Meta>(packet->payload()));
+ break;
+
+ case SR_DF_FRAME_BEGIN:
+ feed_in_frame_begin();
break;
case SR_DF_LOGIC:
- assert(packet->payload);
- feed_in_logic(*(const sr_datafeed_logic*)packet->payload);
+ feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
break;
case SR_DF_ANALOG:
- assert(packet->payload);
- feed_in_analog(*(const sr_datafeed_analog*)packet->payload);
+ feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
break;
case SR_DF_END:
_cur_logic_snapshot.reset();
_cur_analog_snapshots.clear();
}
- data_updated();
+ frame_ended();
break;
}
+ default:
+ break;
}
}
-void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
- const struct sr_datafeed_packet *packet, void *cb_data)
-{
- (void) cb_data;
- assert(_session);
- _session->data_feed_in(sdi, packet);
-}
-
} // namespace pv
projects / pulseview.git / blobdiff