* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef ENABLE_DECODE
-#include <libsigrokdecode/libsigrokdecode.h>
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
#endif
+#include <boost/thread/locks.hpp>
+#include <boost/thread/shared_mutex.hpp>
-#include "session.hpp"
+#include <cassert>
+#include <mutex>
+#include <stdexcept>
+
+#include <sys/stat.h>
+#include "session.hpp"
#include "devicemanager.hpp"
#include "data/analog.hpp"
#include "data/decoderstack.hpp"
#include "data/logic.hpp"
#include "data/logicsegment.hpp"
+#include "data/signalbase.hpp"
#include "data/decode/decoder.hpp"
#include "devices/hardwaredevice.hpp"
#include "devices/sessionfile.hpp"
+#include "toolbars/mainbar.hpp"
+
#include "view/analogsignal.hpp"
#include "view/decodetrace.hpp"
#include "view/logicsignal.hpp"
-
-#include <cassert>
-#include <mutex>
-#include <stdexcept>
-
-#include <sys/stat.h>
-
-#include <QDebug>
+#include "view/signal.hpp"
+#include "view/view.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
+#endif
+
using boost::shared_lock;
using boost::shared_mutex;
using boost::unique_lock;
using Glib::Variant;
namespace pv {
-Session::Session(DeviceManager &device_manager) :
+Session::Session(DeviceManager &device_manager, QString name) :
device_manager_(device_manager),
+ name_(name),
capture_state_(Stopped),
cur_samplerate_(0)
{
return device_;
}
+QString Session::name() const
+{
+ return name_;
+}
+
+void Session::set_name(QString name)
+{
+ if (default_name_.isEmpty())
+ default_name_ = name;
+
+ name_ = name;
+
+ name_changed();
+}
+
+std::shared_ptr<pv::view::View> Session::main_view() const
+{
+ return main_view_;
+}
+
+void Session::set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar)
+{
+ main_bar_ = main_bar;
+}
+
+shared_ptr<pv::toolbars::MainBar> Session::main_bar() const
+{
+ return main_bar_;
+}
+
+void Session::save_settings(QSettings &settings) const
+{
+ map<string, string> dev_info;
+ list<string> key_list;
+
+ if (device_) {
+ settings.beginGroup("Device");
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ dev_info = device_manager_.get_device_info(device_);
+
+ for (string key : key_list) {
+ if (dev_info.count(key))
+ settings.setValue(QString::fromUtf8(key.c_str()),
+ QString::fromUtf8(dev_info.at(key).c_str()));
+ else
+ settings.remove(QString::fromUtf8(key.c_str()));
+ }
+
+ // TODO Save channel settings and decoders
+
+ settings.endGroup();
+ }
+}
+
+void Session::restore_settings(QSettings &settings)
+{
+ map<string, string> dev_info;
+ list<string> key_list;
+ shared_ptr<devices::HardwareDevice> device;
+
+ // Re-select last used device if possible but only if it's not demo
+ settings.beginGroup("Device");
+ key_list.push_back("vendor");
+ key_list.push_back("model");
+ key_list.push_back("version");
+ key_list.push_back("serial_num");
+ key_list.push_back("connection_id");
+
+ for (string key : key_list) {
+ const QString k = QString::fromStdString(key);
+ if (!settings.contains(k))
+ continue;
+
+ const string value = settings.value(k).toString().toStdString();
+ if (!value.empty())
+ dev_info.insert(std::make_pair(key, value));
+ }
+
+ if (dev_info.count("model") > 0)
+ device = device_manager_.find_device_from_info(dev_info);
+
+ if (device) {
+ set_device(device);
+
+ // TODO Restore channel settings and decoders
+ }
+
+ settings.endGroup();
+}
+
void Session::set_device(shared_ptr<devices::Device> device)
{
assert(device);
// Ensure we are not capturing before setting the device
stop_capture();
+ if (device_)
+ device_->close();
+
+ device_.reset();
+
+ // Revert name back to default name (e.g. "Untitled-1") as the data is gone
+ name_ = default_name_;
+ name_changed();
+
+ // Remove all stored data
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
+ }
+ for (const shared_ptr<data::SignalData> d : all_signal_data_)
+ d->clear();
+ all_signal_data_.clear();
+ signalbases_.clear();
+ cur_logic_segment_.reset();
+
+ for (auto entry : cur_analog_segments_) {
+ shared_ptr<sigrok::Channel>(entry.first).reset();
+ shared_ptr<data::AnalogSegment>(entry.second).reset();
+ }
+
+ logic_data_.reset();
+
+ signals_changed();
+
device_ = std::move(device);
- device_->create();
+
+ try {
+ device_->open();
+ } catch (const QString &e) {
+ device_.reset();
+ device_selected();
+ throw;
+ }
+
device_->session()->add_datafeed_callback([=]
(shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
data_feed_in(device, packet);
});
- update_signals();
-
- decode_traces_.clear();
+ update_signals();
device_selected();
}
void Session::start_capture(function<void (const QString)> error_handler)
{
+ if (!device_) {
+ error_handler(tr("No active device set, can't start acquisition."));
+ return;
+ }
+
stop_capture();
// Check that at least one channel is enabled
- assert(device_);
const shared_ptr<sigrok::Device> sr_dev = device_->device();
if (sr_dev) {
const auto channels = sr_dev->channels();
}
}
+ // Clear signal data
+ for (const shared_ptr<data::SignalData> d : all_signal_data_)
+ d->clear();
+
+ // Revert name back to default name (e.g. "Untitled-1") as the data is gone
+ name_ = default_name_;
+ name_changed();
+
// Begin the session
sampling_thread_ = std::thread(
- &Session::sample_thread_proc, this, device_,
- error_handler);
+ &Session::sample_thread_proc, this, error_handler);
}
void Session::stop_capture()
sampling_thread_.join();
}
-set< shared_ptr<data::SignalData> > Session::get_data() const
+void Session::register_view(std::shared_ptr<pv::view::View> view)
{
- shared_lock<shared_mutex> lock(signals_mutex_);
- set< shared_ptr<data::SignalData> > data;
- for (const shared_ptr<view::Signal> sig : signals_) {
- assert(sig);
- data.insert(sig->data());
+ if (views_.empty()) {
+ main_view_ = view;
}
- return data;
+ views_.insert(view);
}
-boost::shared_mutex& Session::signals_mutex() const
+void Session::deregister_view(std::shared_ptr<pv::view::View> view)
{
- return signals_mutex_;
+ views_.erase(view);
+
+ if (views_.empty()) {
+ main_view_.reset();
+
+ // Without a view there can be no main bar
+ main_bar_.reset();
+ }
+}
+
+bool Session::has_view(std::shared_ptr<pv::view::View> view)
+{
+ return views_.find(view) != views_.end();
+}
+
+double Session::get_samplerate() const
+{
+ double samplerate = 0.0;
+
+ for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+ assert(d);
+ const vector< shared_ptr<pv::data::Segment> > segments =
+ d->segments();
+ for (const shared_ptr<pv::data::Segment> &s : segments)
+ samplerate = std::max(samplerate, s->samplerate());
+ }
+ // If there is no sample rate given we use samples as unit
+ if (samplerate == 0.0)
+ samplerate = 1.0;
+
+ return samplerate;
}
-const unordered_set< shared_ptr<view::Signal> >& Session::signals() const
+const std::unordered_set< std::shared_ptr<data::SignalBase> >
+ Session::signalbases() const
{
- return signals_;
+ return signalbases_;
}
#ifdef ENABLE_DECODE
bool Session::add_decoder(srd_decoder *const dec)
{
- map<const srd_channel*, shared_ptr<view::LogicSignal> > channels;
+ map<const srd_channel*, shared_ptr<data::SignalBase> > channels;
shared_ptr<data::DecoderStack> decoder_stack;
- try
- {
- lock_guard<boost::shared_mutex> lock(signals_mutex_);
-
+ try {
// Create the decoder
decoder_stack = shared_ptr<data::DecoderStack>(
new data::DecoderStack(*this, dec));
// 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
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(pdch->name).
- toLower().contains(
- l->name().toLower()))
- channels[pdch] = l;
+ for (shared_ptr<data::SignalBase> b : signalbases_) {
+ if (b->type() == ChannelType::LOGIC) {
+ if (QString::fromUtf8(pdch->name).toLower().
+ contains(b->name().toLower()))
+ channels[pdch] = b;
+ }
}
assert(decoder_stack);
decoder_stack->stack().front()->set_channels(channels);
// Create the decode signal
- shared_ptr<view::DecodeTrace> d(
- new view::DecodeTrace(*this, decoder_stack,
- decode_traces_.size()));
- decode_traces_.push_back(d);
- }
- catch(std::runtime_error e)
- {
+ shared_ptr<data::SignalBase> signalbase =
+ shared_ptr<data::SignalBase>(new data::SignalBase(nullptr));
+
+ signalbase->set_decoder_stack(decoder_stack);
+
+ for (std::shared_ptr<pv::view::View> view : views_)
+ view->add_decode_trace(signalbase);
+ } catch (std::runtime_error e) {
return false;
}
return true;
}
-vector< shared_ptr<view::DecodeTrace> > Session::get_decode_signals() const
-{
- shared_lock<shared_mutex> lock(signals_mutex_);
- return decode_traces_;
-}
-
-void Session::remove_decode_signal(view::DecodeTrace *signal)
+void Session::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
{
- for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
- if ((*i).get() == signal)
- {
- decode_traces_.erase(i);
- signals_changed();
- return;
- }
+ for (std::shared_ptr<pv::view::View> view : views_)
+ view->remove_decode_trace(signalbase);
}
#endif
void Session::set_capture_state(capture_state state)
{
- lock_guard<mutex> lock(sampling_mutex_);
- const bool changed = capture_state_ != state;
- capture_state_ = state;
- if(changed)
+ bool changed;
+
+ {
+ lock_guard<mutex> lock(sampling_mutex_);
+ changed = capture_state_ != state;
+ capture_state_ = state;
+ }
+
+ if (changed)
capture_state_changed(state);
}
void Session::update_signals()
{
- assert(device_);
+ if (!device_) {
+ signalbases_.clear();
+ logic_data_.reset();
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
+ }
+ return;
+ }
lock_guard<recursive_mutex> lock(data_mutex_);
const shared_ptr<sigrok::Device> sr_dev = device_->device();
if (!sr_dev) {
- signals_.clear();
+ signalbases_.clear();
logic_data_.reset();
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ view->clear_signals();
+#ifdef ENABLE_DECODE
+ view->clear_decode_traces();
+#endif
+ }
return;
}
}
}
- // Make the Signals list
- {
- unique_lock<shared_mutex> lock(signals_mutex_);
-
- unordered_set< shared_ptr<view::Signal> > prev_sigs(signals_);
- signals_.clear();
+ // Make the signals list
+ for (std::shared_ptr<pv::view::View> view : views_) {
+ unordered_set< shared_ptr<view::Signal> > prev_sigs(view->signals());
+ view->clear_signals();
for (auto channel : sr_dev->channels()) {
+ shared_ptr<data::SignalBase> signalbase;
shared_ptr<view::Signal> signal;
// Find the channel in the old signals
const auto iter = std::find_if(
prev_sigs.cbegin(), prev_sigs.cend(),
[&](const shared_ptr<view::Signal> &s) {
- return s->channel() == channel;
+ return s->base()->channel() == channel;
});
if (iter != prev_sigs.end()) {
// Copy the signal from the old set to the new
signal = *iter;
- auto logic_signal = dynamic_pointer_cast<
- view::LogicSignal>(signal);
- if (logic_signal)
- logic_signal->set_logic_data(
- logic_data_);
} else {
- // Create a new signal
+ // Find the signalbase for this channel if possible
+ signalbase.reset();
+ for (const shared_ptr<data::SignalBase> b : signalbases_)
+ if (b->channel() == channel)
+ signalbase = b;
+
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
+ if (!signalbase) {
+ signalbase = shared_ptr<data::SignalBase>(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ all_signal_data_.insert(logic_data_);
+ signalbase->set_data(logic_data_);
+ }
+
signal = shared_ptr<view::Signal>(
new view::LogicSignal(*this,
- device_, channel,
- logic_data_));
+ device_, signalbase));
+ view->add_signal(signal);
break;
case SR_CHANNEL_ANALOG:
{
- shared_ptr<data::Analog> data(
- new data::Analog());
+ if (!signalbase) {
+ signalbase = shared_ptr<data::SignalBase>(
+ new data::SignalBase(channel));
+ signalbases_.insert(signalbase);
+
+ shared_ptr<data::Analog> data(new data::Analog());
+ all_signal_data_.insert(data);
+ signalbase->set_data(data);
+ }
+
signal = shared_ptr<view::Signal>(
new view::AnalogSignal(
- *this, channel, data));
+ *this, signalbase));
+ view->add_signal(signal);
break;
}
break;
}
}
-
- assert(signal);
- signals_.insert(signal);
}
}
signals_changed();
}
-shared_ptr<view::Signal> Session::signal_from_channel(
- shared_ptr<Channel> channel) const
+shared_ptr<data::SignalBase> Session::signalbase_from_channel(
+ shared_ptr<sigrok::Channel> channel) const
{
- lock_guard<boost::shared_mutex> lock(signals_mutex_);
- for (shared_ptr<view::Signal> sig : signals_) {
+ for (shared_ptr<data::SignalBase> sig : signalbases_) {
assert(sig);
if (sig->channel() == channel)
return sig;
}
- return shared_ptr<view::Signal>();
+ return shared_ptr<data::SignalBase>();
}
-void Session::sample_thread_proc(shared_ptr<devices::Device> device,
- function<void (const QString)> error_handler)
+void Session::sample_thread_proc(function<void (const QString)> error_handler)
{
- assert(device);
assert(error_handler);
+ if (!device_)
+ return;
+
cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
+ out_of_memory_ = false;
+
try {
device_->start();
- } catch(Error e) {
+ } catch (Error e) {
error_handler(e.what());
return;
}
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
- if (cur_logic_segment_)
- {
+ if (cur_logic_segment_) {
qDebug("SR_DF_END was not received.");
assert(0);
}
+
+ if (out_of_memory_)
+ error_handler(tr("Out of memory, acquisition stopped."));
}
void Session::feed_in_header()
for (auto entry : meta->config()) {
switch (entry.first->id()) {
case SR_CONF_SAMPLERATE:
+ // We can't rely on the header to always contain the sample rate,
+ // so in case it's supplied via a meta packet, we use it.
+ if (!cur_samplerate_)
+ cur_samplerate_ = g_variant_get_uint64(entry.second.gobj());
+
/// @todo handle samplerate changes
break;
default:
signals_changed();
}
+void Session::feed_in_trigger()
+{
+ // The channel containing most samples should be most accurate
+ uint64_t sample_count = 0;
+
+ {
+ for (const shared_ptr<pv::data::SignalData> d : all_signal_data_) {
+ assert(d);
+ uint64_t temp_count = 0;
+
+ const vector< shared_ptr<pv::data::Segment> > segments =
+ d->segments();
+ for (const shared_ptr<pv::data::Segment> &s : segments)
+ temp_count += s->get_sample_count();
+
+ if (temp_count > sample_count)
+ sample_count = temp_count;
+ }
+ }
+
+ trigger_event(sample_count / get_samplerate());
+}
+
void Session::feed_in_frame_begin()
{
if (cur_logic_segment_ || !cur_analog_segments_.empty())
{
lock_guard<recursive_mutex> lock(data_mutex_);
- if (!logic_data_)
- {
+ const size_t sample_count = logic->data_length() / logic->unit_size();
+
+ if (!logic_data_) {
// 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_)
- {
+ if (!cur_logic_segment_) {
// This could be the first packet after a trigger
set_capture_state(Running);
- // Get sample limit.
- 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>(
new data::LogicSegment(
- logic, cur_samplerate_, sample_limit));
+ logic, cur_samplerate_, sample_count));
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
// frame_began is DecoderStack, but in future we need to signal
// this after both analog and logic sweeps have begun.
frame_began();
- }
- else
- {
+ } else {
// Append to the existing data segment
cur_logic_segment_->append_payload(logic);
}
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();
+ const float *data = static_cast<const float *>(analog->data_pointer());
bool sweep_beginning = false;
- for (auto channel : channels)
- {
+ if (signalbases_.empty())
+ update_signals();
+
+ for (auto channel : channels) {
shared_ptr<data::AnalogSegment> segment;
// Try to get the segment of the channel
iterator iter = cur_analog_segments_.find(channel);
if (iter != cur_analog_segments_.end())
segment = (*iter).second;
- else
- {
- // If no segment was found, this means we havn't
+ else {
+ // If no segment was found, this means we haven't
// created one yet. i.e. this is the first packet
// in the sweep containing this segment.
sweep_beginning = true;
- // 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();
- } catch (Error) {
- sample_limit = 0;
- }
-
// Create a segment, keep it in the maps of channels
segment = shared_ptr<data::AnalogSegment>(
new data::AnalogSegment(
- cur_samplerate_, sample_limit));
+ cur_samplerate_, sample_count));
cur_analog_segments_[channel] = segment;
- // Find the annalog data associated with the channel
- shared_ptr<view::AnalogSignal> sig =
- dynamic_pointer_cast<view::AnalogSignal>(
- signal_from_channel(channel));
- assert(sig);
+ // Find the analog data associated with the channel
+ shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
+ assert(base);
- shared_ptr<data::Analog> data(sig->analog_data());
+ shared_ptr<data::Analog> data(base->analog_data());
assert(data);
// Push the segment into the analog data.
feed_in_meta(dynamic_pointer_cast<Meta>(packet->payload()));
break;
+ case SR_DF_TRIGGER:
+ feed_in_trigger();
+ break;
+
case SR_DF_FRAME_BEGIN:
feed_in_frame_begin();
break;
case SR_DF_LOGIC:
- feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
+ try {
+ feed_in_logic(dynamic_pointer_cast<Logic>(packet->payload()));
+ } catch (std::bad_alloc) {
+ out_of_memory_ = true;
+ device_->stop();
+ }
break;
case SR_DF_ANALOG:
- feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
+ try {
+ feed_in_analog(dynamic_pointer_cast<Analog>(packet->payload()));
+ } catch (std::bad_alloc) {
+ out_of_memory_ = true;
+ device_->stop();
+ }
break;
case SR_DF_END:
projects / pulseview.git / blobdiff