#include "data/logicsegment.hpp"
#include "data/decode/decoder.hpp"
+#include "devices/hardwaredevice.hpp"
+#include "devices/sessionfile.hpp"
+
#include "view/analogsignal.hpp"
#include "view/decodetrace.hpp"
#include "view/logicsignal.hpp"
using std::list;
using std::map;
using std::mutex;
+using std::recursive_mutex;
using std::set;
using std::shared_ptr;
using std::string;
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;
namespace pv {
Session::Session(DeviceManager &device_manager) :
device_manager_(device_manager),
- session_(device_manager.context()->create_session()),
capture_state_(Stopped),
cur_samplerate_(0)
{
- set_default_device();
}
Session::~Session()
return device_manager_;
}
-const shared_ptr<sigrok::Session>& Session::session() const
+shared_ptr<sigrok::Session> Session::session() const
{
- return session_;
+ if (!device_)
+ return shared_ptr<sigrok::Session>();
+ return device_->session();
}
-shared_ptr<Device> Session::device() const
+shared_ptr<devices::Device> Session::device() const
{
return device_;
}
-void Session::set_device(shared_ptr<Device> device)
+void Session::set_device(shared_ptr<devices::Device> device)
{
+ assert(device);
+
// Ensure we are not capturing before setting the device
stop_capture();
- if (device_) {
- session_->remove_datafeed_callbacks();
-
- // Did we have a hardware device selected previously?
- if (!dynamic_pointer_cast<HardwareDevice>(device_)) {
- device_->close();
- session_->remove_devices();
- }
- }
+ device_ = std::move(device);
+ device_->create();
+ device_->session()->add_datafeed_callback([=]
+ (shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
+ data_feed_in(device, packet);
+ });
+ update_signals();
decode_traces_.clear();
- if (device) {
- // Are we setting a session device?
- const auto session_device =
- dynamic_pointer_cast<SessionDevice>(device);
-
- if (session_device)
- session_ = session_device->parent();
- else {
- session_ = device_manager_.context()->create_session();
-
- try {
- device->open();
- } catch(const sigrok::Error &e) {
- throw QString(e.what());
- }
-
- session_->add_device(device);
- }
-
- device_ = device;
- 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);
- } else
- device_ = nullptr;
-
device_selected();
}
-void Session::set_session_file(const string &name)
-{
- const shared_ptr<sigrok::Session> session =
- device_manager_.context()->load_session(name);
- set_device(session->devices()[0]);
-}
-
void Session::set_default_device()
{
- shared_ptr<HardwareDevice> default_device;
- const list< shared_ptr<HardwareDevice> > &devices =
+ const list< shared_ptr<devices::HardwareDevice> > &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
- for (shared_ptr<HardwareDevice> dev : devices)
- if (dev->driver()->name().compare("demo") == 0) {
- default_device = dev;
- break;
- }
+ if (devices.empty())
+ return;
- set_device(default_device);
- }
+ // Try and find the demo device and select that by default
+ const auto iter = std::find_if(devices.begin(), devices.end(),
+ [] (const shared_ptr<devices::HardwareDevice> &d) {
+ return d->hardware_device()->driver()->name() ==
+ "demo"; });
+ set_device((iter == devices.end()) ? devices.front() : *iter);
}
Session::capture_state Session::get_capture_state() const
{
stop_capture();
- // Check that a device instance has been selected.
- if (!device_) {
- qDebug() << "No device selected";
- return;
- }
-
// 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(); });
-
- if (!enabled) {
- error_handler(tr("No channels enabled."));
- return;
+ assert(device_);
+ const shared_ptr<sigrok::Device> sr_dev = device_->device();
+ if (sr_dev) {
+ const auto channels = sr_dev->channels();
+ if (!std::any_of(channels.begin(), channels.end(),
+ [](shared_ptr<Channel> channel) {
+ return channel->enabled(); })) {
+ error_handler(tr("No channels enabled."));
+ return;
+ }
}
+ // Clear signal data
+ for (const shared_ptr<data::SignalData> d : get_data())
+ d->clear();
+
// Begin the session
sampling_thread_ = std::thread(
&Session::sample_thread_proc, this, device_,
void Session::stop_capture()
{
if (get_capture_state() != Stopped)
- session_->stop();
+ device_->stop();
// Check that sampling stopped
if (sampling_thread_.joinable())
// Make a list of all the channels
std::vector<const srd_channel*> all_channels;
- for(const GSList *i = dec->channels; i; i = i->next)
+ 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)
+ for (const GSList *i = dec->opt_channels; i; i = i->next)
all_channels.push_back((const srd_channel*)i->data);
// Auto select the initial channels
lock_guard<mutex> lock(sampling_mutex_);
const bool changed = capture_state_ != state;
capture_state_ = state;
- if(changed)
+ if (changed)
capture_state_changed(state);
}
-void Session::update_signals(shared_ptr<Device> device)
+void Session::update_signals()
{
- assert(device);
- assert(capture_state_ == Stopped);
+ assert(device_);
+
+ lock_guard<recursive_mutex> lock(data_mutex_);
+
+ const shared_ptr<sigrok::Device> sr_dev = device_->device();
+ if (!sr_dev) {
+ signals_.clear();
+ logic_data_.reset();
+ return;
+ }
// Detect what data types we will receive
- auto channels = device->channels();
+ auto channels = sr_dev->channels();
unsigned int logic_channel_count = std::count_if(
channels.begin(), channels.end(),
[] (shared_ptr<Channel> channel) {
// Create data containers for the logic data segments
{
- lock_guard<mutex> data_lock(data_mutex_);
+ lock_guard<recursive_mutex> data_lock(data_mutex_);
if (logic_channel_count == 0) {
logic_data_.reset();
unordered_set< shared_ptr<view::Signal> > prev_sigs(signals_);
signals_.clear();
- for (auto channel : device->channels()) {
+ for (auto channel : sr_dev->channels()) {
shared_ptr<view::Signal> signal;
// Find the channel in the old signals
case SR_CHANNEL_LOGIC:
signal = shared_ptr<view::Signal>(
new view::LogicSignal(*this,
- device, channel,
+ device_, channel,
logic_data_));
break;
return shared_ptr<view::Signal>();
}
-void Session::read_sample_rate(shared_ptr<Device> device)
-{
- const auto keys = device_->config_keys(ConfigKey::DEVICE_OPTIONS);
- const auto iter = keys.find(ConfigKey::SAMPLERATE);
- cur_samplerate_ = (iter != keys.end() &&
- (*iter).second.find(sigrok::GET) != (*iter).second.end()) ?
- VariantBase::cast_dynamic<Variant<guint64>>(
- device->config_get(ConfigKey::SAMPLERATE)).get() : 0;
-}
-
-void Session::sample_thread_proc(shared_ptr<Device> device,
+void Session::sample_thread_proc(shared_ptr<devices::Device> device,
function<void (const QString)> error_handler)
{
assert(device);
assert(error_handler);
- read_sample_rate(device);
+ (void)device;
+
+ cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
try {
- session_->start();
+ device_->start();
} catch(Error e) {
error_handler(e.what());
return;
}
- set_capture_state(session_->trigger() ?
+ set_capture_state(device_->session()->trigger() ?
AwaitingTrigger : Running);
- session_->run();
+ device_->run();
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
}
}
-void Session::feed_in_header(shared_ptr<Device> device)
+void Session::feed_in_header()
{
- read_sample_rate(device);
+ cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
}
-void Session::feed_in_meta(shared_ptr<Device> device,
- shared_ptr<Meta> meta)
+void Session::feed_in_meta(shared_ptr<Meta> meta)
{
- (void)device;
-
for (auto entry : meta->config()) {
switch (entry.first->id()) {
case SR_CONF_SAMPLERATE:
void Session::feed_in_logic(shared_ptr<Logic> logic)
{
- lock_guard<mutex> lock(data_mutex_);
+ lock_guard<recursive_mutex> lock(data_mutex_);
if (!logic_data_)
{
- qDebug() << "Unexpected logic packet";
- return;
+ // The only reason logic_data_ would not have been created is
+ // if it was not possible to determine the signals when the
+ // device was created.
+ update_signals();
}
if (!cur_logic_segment_)
set_capture_state(Running);
// Get sample limit.
- const auto keys = device_->config_keys(
- ConfigKey::DEVICE_OPTIONS);
- const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
- const uint64_t sample_limit = (iter != keys.end() &&
- (*iter).second.find(sigrok::GET) !=
- (*iter).second.end()) ?
- VariantBase::cast_dynamic<Variant<guint64>>(
- device_->config_get(ConfigKey::LIMIT_SAMPLES)).get() : 0;
+ const uint64_t sample_limit = device_->read_config<uint64_t>(
+ ConfigKey::LIMIT_SAMPLES);
// Create a new data segment
cur_logic_segment_ = shared_ptr<data::LogicSegment>(
void Session::feed_in_analog(shared_ptr<Analog> analog)
{
- lock_guard<mutex> lock(data_mutex_);
+ lock_guard<recursive_mutex> lock(data_mutex_);
const vector<shared_ptr<Channel>> channels = analog->channels();
const unsigned int channel_count = channels.size();
// Get sample limit.
uint64_t sample_limit;
try {
+ assert(device_);
+ const std::shared_ptr<sigrok::Device> device =
+ device_->device();
+ assert(device);
sample_limit = VariantBase::cast_dynamic<Variant<guint64>>(
- device_->config_get(ConfigKey::LIMIT_SAMPLES)).get();
+ device->config_get(ConfigKey::LIMIT_SAMPLES)).get();
} catch (Error) {
sample_limit = 0;
}
data_received();
}
-void Session::data_feed_in(shared_ptr<Device> device, shared_ptr<Packet> packet)
+void Session::data_feed_in(shared_ptr<sigrok::Device> device,
+ shared_ptr<Packet> packet)
{
+ (void)device;
+
assert(device);
+ assert(device == device_->device());
assert(packet);
switch (packet->type()->id()) {
case SR_DF_HEADER:
- feed_in_header(device);
+ feed_in_header();
break;
case SR_DF_META:
- feed_in_meta(device, dynamic_pointer_cast<Meta>(packet->payload()));
+ feed_in_meta(dynamic_pointer_cast<Meta>(packet->payload()));
break;
case SR_DF_FRAME_BEGIN:
case SR_DF_END:
{
{
- lock_guard<mutex> lock(data_mutex_);
+ lock_guard<recursive_mutex> lock(data_mutex_);
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
projects / pulseview.git / blobdiff