X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=9ec8bd07264036e85c052c05695749f4bccf797b;hb=0bb3dd25421a8638afb881d46799a13378d3f00b;hp=07917e582ff2846d537fecaf755dfa4e125daae7;hpb=132a5c6d4b3c220d1cb6d942bf9d7e8b180ab1c3;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index 07917e58..9ec8bd07 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,8 +17,6 @@
* along with this program; if not, see .
*/
-#include
-
#include
#include
#include
@@ -26,13 +24,17 @@
#include
+#include
+#include
+
#include "devicemanager.hpp"
+#include "mainwindow.hpp"
#include "session.hpp"
+#include "util.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.hpp"
#include "data/decode/decoder.hpp"
-#include "data/decoderstack.hpp"
#include "data/logic.hpp"
#include "data/logicsegment.hpp"
#include "data/signalbase.hpp"
@@ -51,6 +53,11 @@
#include
+#ifdef ENABLE_FLOW
+#include
+#include
+#endif
+
#ifdef ENABLE_DECODE
#include
#include "data/decodesignal.hpp"
@@ -60,8 +67,8 @@ using std::bad_alloc;
using std::dynamic_pointer_cast;
using std::find_if;
using std::function;
-using std::lock_guard;
using std::list;
+using std::lock_guard;
using std::make_pair;
using std::make_shared;
using std::map;
@@ -73,8 +80,10 @@ using std::recursive_mutex;
using std::runtime_error;
using std::shared_ptr;
using std::string;
+#ifdef ENABLE_FLOW
+using std::unique_lock;
+#endif
using std::unique_ptr;
-using std::unordered_set;
using std::vector;
using sigrok::Analog;
@@ -90,8 +99,24 @@ using sigrok::Session;
using Glib::VariantBase;
+#ifdef ENABLE_FLOW
+using Gst::Bus;
+using Gst::ElementFactory;
+using Gst::Pipeline;
+#endif
+
+using pv::data::SignalGroup;
+using pv::util::Timestamp;
+using pv::views::trace::Signal;
+using pv::views::trace::AnalogSignal;
+using pv::views::trace::LogicSignal;
+
namespace pv {
+
+shared_ptr Session::sr_context;
+
Session::Session(DeviceManager &device_manager, QString name) :
+ shutting_down_(false),
device_manager_(device_manager),
default_name_(name),
name_(name),
@@ -103,8 +128,15 @@ Session::Session(DeviceManager &device_manager, QString name) :
Session::~Session()
{
+ shutting_down_ = true;
+
// Stop and join to the thread
stop_capture();
+
+ for (SignalGroup* group : signal_groups_) {
+ group->clear();
+ delete group;
+ }
}
DeviceManager& Session::device_manager()
@@ -144,7 +176,7 @@ void Session::set_name(QString name)
name_changed();
}
-const list< shared_ptr > Session::views() const
+const vector< shared_ptr > Session::views() const
{
return views_;
}
@@ -169,11 +201,89 @@ bool Session::data_saved() const
return data_saved_;
}
+void Session::save_setup(QSettings &settings) const
+{
+ int i = 0;
+
+ // Save channels and decoders
+ for (const shared_ptr& base : signalbases_) {
+#ifdef ENABLE_DECODE
+ if (base->is_decode_signal()) {
+ settings.beginGroup("decode_signal" + QString::number(i++));
+ base->save_settings(settings);
+ settings.endGroup();
+ } else
+#endif
+ {
+ settings.beginGroup(base->internal_name());
+ base->save_settings(settings);
+ settings.endGroup();
+ }
+ }
+
+ settings.setValue("decode_signals", i);
+
+ // Save view states and their signal settings
+ // Note: main_view must be saved as view0
+ i = 0;
+ settings.beginGroup("view" + QString::number(i++));
+ main_view_->save_settings(settings);
+ settings.endGroup();
+
+ for (const shared_ptr& view : views_) {
+ if (view != main_view_) {
+ settings.beginGroup("view" + QString::number(i++));
+ settings.setValue("type", view->get_type());
+ view->save_settings(settings);
+ settings.endGroup();
+ }
+ }
+
+ settings.setValue("views", i);
+
+ int view_id = 0;
+ i = 0;
+ for (const shared_ptr& vb : views_) {
+ shared_ptr tv = dynamic_pointer_cast(vb);
+ if (tv) {
+ for (const shared_ptr& time_item : tv->time_items()) {
+
+ const shared_ptr flag =
+ dynamic_pointer_cast(time_item);
+ if (flag) {
+ if (!flag->enabled())
+ continue;
+
+ settings.beginGroup("meta_obj" + QString::number(i++));
+ settings.setValue("type", "time_marker");
+ settings.setValue("assoc_view", view_id);
+ GlobalSettings::store_timestamp(settings, "time", flag->time());
+ settings.setValue("text", flag->get_text());
+ settings.endGroup();
+ }
+ }
+
+ if (tv->cursors_shown()) {
+ settings.beginGroup("meta_obj" + QString::number(i++));
+ settings.setValue("type", "selection");
+ settings.setValue("assoc_view", view_id);
+ const shared_ptr cp = tv->cursors();
+ GlobalSettings::store_timestamp(settings, "start_time", cp->first()->time());
+ GlobalSettings::store_timestamp(settings, "end_time", cp->second()->time());
+ settings.endGroup();
+ }
+ }
+
+ view_id++;
+ }
+
+ settings.setValue("meta_objs", i);
+}
+
void Session::save_settings(QSettings &settings) const
{
map dev_info;
list key_list;
- int stacks = 0, views = 0;
if (device_) {
shared_ptr hw_device =
@@ -191,7 +301,7 @@ void Session::save_settings(QSettings &settings) const
dev_info = device_manager_.get_device_info(device_);
- for (string key : key_list) {
+ 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()));
@@ -203,7 +313,7 @@ void Session::save_settings(QSettings &settings) const
}
shared_ptr sessionfile_device =
- dynamic_pointer_cast< devices::SessionFile >(device_);
+ dynamic_pointer_cast(device_);
if (sessionfile_device) {
settings.setValue("device_type", "sessionfile");
@@ -213,45 +323,87 @@ void Session::save_settings(QSettings &settings) const
settings.endGroup();
}
- // Save channels and decoders
- for (shared_ptr base : signalbases_) {
+ shared_ptr inputfile_device =
+ dynamic_pointer_cast(device_);
+
+ if (inputfile_device) {
+ settings.setValue("device_type", "inputfile");
+ settings.beginGroup("device");
+ inputfile_device->save_meta_to_settings(settings);
+ settings.endGroup();
+ }
+
+ save_setup(settings);
+ }
+}
+
+void Session::restore_setup(QSettings &settings)
+{
+ // Restore channels
+ for (shared_ptr base : signalbases_) {
+ settings.beginGroup(base->internal_name());
+ base->restore_settings(settings);
+ settings.endGroup();
+ }
+
+ // Restore decoders
#ifdef ENABLE_DECODE
- if (base->is_decode_signal()) {
- shared_ptr decoder_stack =
- base->decoder_stack();
- shared_ptr top_decoder =
- decoder_stack->stack().front();
-
- settings.beginGroup("decoder_stack" + QString::number(stacks++));
- settings.setValue("id", top_decoder->decoder()->id);
- settings.setValue("name", top_decoder->decoder()->name);
- settings.endGroup();
- } else
+ int decode_signals = settings.value("decode_signals").toInt();
+
+ for (int i = 0; i < decode_signals; i++) {
+ settings.beginGroup("decode_signal" + QString::number(i));
+ shared_ptr signal = add_decode_signal();
+ signal->restore_settings(settings);
+ settings.endGroup();
+ }
#endif
- {
- settings.beginGroup(base->internal_name());
- base->save_settings(settings);
- settings.endGroup();
- }
- }
- settings.setValue("decoder_stacks", stacks);
+ // Restore views
+ int views = settings.value("views").toInt();
+
+ for (int i = 0; i < views; i++) {
+ settings.beginGroup("view" + QString::number(i));
+
+ if (i > 0) {
+ views::ViewType type = (views::ViewType)settings.value("type").toInt();
+ add_view(type, this);
+ views_.back()->restore_settings(settings);
+ } else
+ main_view_->restore_settings(settings);
- // Save view states and their signal settings
- // Note: main_view must be saved as view0
- settings.beginGroup("view" + QString::number(views++));
- main_view_->save_settings(settings);
settings.endGroup();
+ }
- for (shared_ptr view : views_) {
- if (view != main_view_) {
- settings.beginGroup("view" + QString::number(views++));
- view->save_settings(settings);
- settings.endGroup();
- }
+ // Restore meta objects like markers and cursors
+ int meta_objs = settings.value("meta_objs").toInt();
+
+ for (int i = 0; i < meta_objs; i++) {
+ settings.beginGroup("meta_obj" + QString::number(i));
+
+ shared_ptr vb;
+ shared_ptr tv;
+ if (settings.contains("assoc_view"))
+ vb = views_.at(settings.value("assoc_view").toInt());
+
+ if (vb)
+ tv = dynamic_pointer_cast(vb);
+
+ const QString type = settings.value("type").toString();
+
+ if ((type == "time_marker") && tv) {
+ Timestamp ts = GlobalSettings::restore_timestamp(settings, "time");
+ shared_ptr flag = tv->add_flag(ts);
+ flag->set_text(settings.value("text").toString());
}
- settings.setValue("views", views);
+ if ((type == "selection") && tv) {
+ Timestamp start = GlobalSettings::restore_timestamp(settings, "start_time");
+ Timestamp end = GlobalSettings::restore_timestamp(settings, "end_time");
+ tv->set_cursors(start, end);
+ tv->show_cursors();
+ }
+
+ settings.endGroup();
}
}
@@ -259,7 +411,7 @@ void Session::restore_settings(QSettings &settings)
{
shared_ptr device;
- QString device_type = settings.value("device_type").toString();
+ const QString device_type = settings.value("device_type").toString();
if (device_type == "hardware") {
map dev_info;
@@ -292,61 +444,39 @@ void Session::restore_settings(QSettings &settings)
settings.endGroup();
}
- if (device_type == "sessionfile") {
- settings.beginGroup("device");
- QString filename = settings.value("filename").toString();
- settings.endGroup();
-
- if (QFileInfo(filename).isReadable()) {
- device = make_shared(device_manager_.context(),
- filename.toStdString());
- set_device(device);
-
- // TODO Perform error handling
- start_capture([](QString infoMessage) { (void)infoMessage; });
-
- set_name(QFileInfo(filename).fileName());
- }
- }
-
- if (device) {
- // Restore channels
- for (shared_ptr base : signalbases_) {
- settings.beginGroup(base->internal_name());
- base->restore_settings(settings);
+ if ((device_type == "sessionfile") || (device_type == "inputfile")) {
+ if (device_type == "sessionfile") {
+ settings.beginGroup("device");
+ const QString filename = settings.value("filename").toString();
settings.endGroup();
- }
- // Restore decoders
-#ifdef ENABLE_DECODE
- int stacks = settings.value("decoder_stacks").toInt();
-
- for (int i = 0; i < stacks; i++) {
- settings.beginGroup("decoder_stack" + QString::number(i++));
-
- QString id = settings.value("id").toString();
- add_decoder(srd_decoder_get_by_id(id.toStdString().c_str()));
+ if (QFileInfo(filename).isReadable()) {
+ device = make_shared(device_manager_.context(),
+ filename.toStdString());
+ }
+ }
+ if (device_type == "inputfile") {
+ settings.beginGroup("device");
+ device = make_shared(device_manager_.context(),
+ settings);
settings.endGroup();
}
-#endif
-
- // Restore views
- int views = settings.value("views").toInt();
- for (int i = 0; i < views; i++) {
- settings.beginGroup("view" + QString::number(i));
+ if (device) {
+ set_device(device);
- if (i > 0) {
- views::ViewType type = (views::ViewType)settings.value("type").toInt();
- add_view(name_, type, this);
- views_.back()->restore_settings(settings);
- } else
- main_view_->restore_settings(settings);
+ start_capture([](QString infoMessage) {
+ // TODO Emulate noquote()
+ qDebug() << "Session error:" << infoMessage; });
- settings.endGroup();
+ set_name(QString::fromStdString(
+ dynamic_pointer_cast(device)->display_name(device_manager_)));
}
}
+
+ if (device)
+ restore_setup(settings);
}
void Session::select_device(shared_ptr device)
@@ -357,8 +487,7 @@ void Session::select_device(shared_ptr device)
else
set_default_device();
} catch (const QString &e) {
- main_bar_->session_error(tr("Failed to Select Device"),
- tr("Failed to Select Device"));
+ MainWindow::show_session_error(tr("Failed to select device"), e);
}
}
@@ -378,20 +507,29 @@ void Session::set_device(shared_ptr device)
name_ = default_name_;
name_changed();
- // Remove all stored data
+ // Remove all stored data and reset all views
for (shared_ptr view : views_) {
- view->clear_signals();
+ view->clear_signalbases();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
#endif
+ view->reset_view_state();
+ }
+
+ for (SignalGroup* group : signal_groups_) {
+ group->clear();
+ delete group;
}
- for (const shared_ptr d : all_signal_data_)
+ signal_groups_.clear();
+
+ for (const shared_ptr& d : all_signal_data_)
d->clear();
+
all_signal_data_.clear();
signalbases_.clear();
cur_logic_segment_.reset();
- for (auto entry : cur_analog_segments_) {
+ for (auto& entry : cur_analog_segments_) {
shared_ptr(entry.first).reset();
shared_ptr(entry.second).reset();
}
@@ -406,6 +544,7 @@ void Session::set_device(shared_ptr device)
device_->open();
} catch (const QString &e) {
device_.reset();
+ MainWindow::show_session_error(tr("Failed to open device"), e);
}
if (device_) {
@@ -431,10 +570,21 @@ void Session::set_default_device()
// Try and find the demo device and select that by default
const auto iter = find_if(devices.begin(), devices.end(),
[] (const shared_ptr &d) {
- return d->hardware_device()->driver()->name() == "demo"; });
+ return d->hardware_device()->driver()->name() == "demo"; });
set_device((iter == devices.end()) ? devices.front() : *iter);
}
+bool Session::using_file_device() const
+{
+ shared_ptr sessionfile_device =
+ dynamic_pointer_cast(device_);
+
+ shared_ptr inputfile_device =
+ dynamic_pointer_cast(device_);
+
+ return (sessionfile_device || inputfile_device);
+}
+
/**
* Convert generic options to data types that are specific to InputFormat.
*
@@ -449,7 +599,7 @@ Session::input_format_options(vector user_spec,
{
map result;
- for (auto entry : user_spec) {
+ for (auto& entry : user_spec) {
/*
* Split key=value specs. Accept entries without separator
* (for simplified boolean specifications).
@@ -480,7 +630,8 @@ Session::input_format_options(vector user_spec,
return result;
}
-void Session::load_init_file(const string &file_name, const string &format)
+void Session::load_init_file(const string &file_name,
+ const string &format, const string &setup_file_name)
{
shared_ptr input_format;
map input_opts;
@@ -495,7 +646,7 @@ void Session::load_init_file(const string &file_name, const string &format)
[&](const pair > f) {
return f.first == user_name; });
if (iter == formats.end()) {
- main_bar_->session_error(tr("Error"),
+ MainWindow::show_session_error(tr("Error"),
tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
return;
}
@@ -504,16 +655,20 @@ void Session::load_init_file(const string &file_name, const string &format)
input_format->options());
}
- load_file(QString::fromStdString(file_name), input_format, input_opts);
+ load_file(QString::fromStdString(file_name), QString::fromStdString(setup_file_name),
+ input_format, input_opts);
}
-void Session::load_file(QString file_name,
- shared_ptr format,
- const map &options)
+void Session::load_file(QString file_name, QString setup_file_name,
+ shared_ptr format, const map &options)
{
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
+ // In the absence of a caller's format spec, try to auto detect.
+ // Assume "sigrok session file" upon lookup miss.
+ if (!format)
+ format = device_manager_.context()->input_format_match(file_name.toStdString());
try {
if (format)
set_device(shared_ptr(
@@ -526,17 +681,29 @@ void Session::load_file(QString file_name,
new devices::SessionFile(
device_manager_.context(),
file_name.toStdString())));
- } catch (Error e) {
- main_bar_->session_error(tr("Failed to load ") + file_name, e.what());
+ } catch (Error& e) {
+ MainWindow::show_session_error(tr("Failed to load %1").arg(file_name), e.what());
set_default_device();
main_bar_->update_device_list();
return;
}
+ // Use the input file with .pvs extension if no setup file was given
+ if (setup_file_name.isEmpty()) {
+ setup_file_name = file_name;
+ setup_file_name.truncate(setup_file_name.lastIndexOf('.'));
+ setup_file_name.append(".pvs");
+ }
+
+ if (QFileInfo::exists(setup_file_name) && QFileInfo(setup_file_name).isReadable()) {
+ QSettings settings_storage(setup_file_name, QSettings::IniFormat);
+ restore_setup(settings_storage);
+ }
+
main_bar_->update_device_list();
start_capture([&, errorMessage](QString infoMessage) {
- main_bar_->session_error(errorMessage, infoMessage); });
+ MainWindow::show_session_error(errorMessage, infoMessage); });
set_name(QFileInfo(file_name).fileName());
}
@@ -569,9 +736,11 @@ void Session::start_capture(function error_handler)
}
// Clear signal data
- for (const shared_ptr d : all_signal_data_)
+ for (const shared_ptr& d : all_signal_data_)
d->clear();
+ trigger_list_.clear();
+
// Revert name back to default name (e.g. "Session 1") for real devices
// as the (possibly saved) data is gone. File devices keep their name.
shared_ptr hw_device =
@@ -599,18 +768,48 @@ void Session::stop_capture()
void Session::register_view(shared_ptr view)
{
- if (views_.empty()) {
+ if (views_.empty())
main_view_ = view;
- }
views_.push_back(view);
+ // Add all device signals
update_signals();
+
+ // Add all other signals
+ vector< shared_ptr > view_signalbases = view->signalbases();
+
+ for (const shared_ptr& signalbase : signalbases_) {
+ const int sb_exists = count_if(
+ view_signalbases.cbegin(), view_signalbases.cend(),
+ [&](const shared_ptr &sb) {
+ return sb == signalbase;
+ });
+
+ // Add the signal to the view if it doesn't have it yet
+ if (!sb_exists)
+ switch (signalbase->type()) {
+ case data::SignalBase::AnalogChannel:
+ case data::SignalBase::LogicChannel:
+ case data::SignalBase::MathChannel:
+ view->add_signalbase(signalbase);
+ break;
+ case data::SignalBase::DecodeChannel:
+#ifdef ENABLE_DECODE
+ view->add_decode_signal(dynamic_pointer_cast(signalbase));
+#endif
+ break;
+ }
+ }
+
+ signals_changed();
}
void Session::deregister_view(shared_ptr view)
{
- views_.remove_if([&](shared_ptr v) { return v == view; });
+ views_.erase(std::remove_if(views_.begin(), views_.end(),
+ [&](shared_ptr v) { return v == view; }),
+ views_.end());
if (views_.empty()) {
main_view_.reset();
@@ -622,7 +821,7 @@ void Session::deregister_view(shared_ptr view)
bool Session::has_view(shared_ptr view)
{
- for (shared_ptr v : views_)
+ for (shared_ptr& v : views_)
if (v == view)
return true;
@@ -633,11 +832,11 @@ double Session::get_samplerate() const
{
double samplerate = 0.0;
- for (const shared_ptr d : all_signal_data_) {
+ for (const shared_ptr& d : all_signal_data_) {
assert(d);
const vector< shared_ptr > segments =
d->segments();
- for (const shared_ptr &s : segments)
+ for (const shared_ptr& s : segments)
samplerate = max(samplerate, s->samplerate());
}
// If there is no sample rate given we use samples as unit
@@ -647,64 +846,124 @@ double Session::get_samplerate() const
return samplerate;
}
-const unordered_set< shared_ptr > Session::signalbases() const
+uint32_t Session::get_segment_count() const
+{
+ uint32_t value = 0;
+
+ // Find the highest number of segments
+ for (const shared_ptr& data : all_signal_data_)
+ if (data->get_segment_count() > value)
+ value = data->get_segment_count();
+
+ return value;
+}
+
+vector Session::get_triggers(uint32_t segment_id) const
+{
+ vector result;
+
+ for (const pair& entry : trigger_list_)
+ if (entry.first == segment_id)
+ result.push_back(entry.second);
+
+ return result;
+}
+
+const vector< shared_ptr > Session::signalbases() const
{
return signalbases_;
}
-#ifdef ENABLE_DECODE
-bool Session::add_decoder(srd_decoder *const dec)
+void Session::add_generated_signal(shared_ptr signal)
{
- if (!dec)
- return false;
+ signalbases_.push_back(signal);
- map > channels;
- shared_ptr decoder_stack;
+ for (shared_ptr& view : views_)
+ view->add_signalbase(signal);
- try {
- // Create the decoder
- decoder_stack = make_shared(*this, dec);
+ update_signals();
+}
+
+void Session::remove_generated_signal(shared_ptr signal)
+{
+ if (shutting_down_)
+ return;
+
+ signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+ [&](shared_ptr s) { return s == signal; }),
+ signalbases_.end());
+
+ for (shared_ptr& view : views_)
+ view->remove_signalbase(signal);
- assert(decoder_stack);
- assert(!decoder_stack->stack().empty());
- assert(decoder_stack->stack().front());
- decoder_stack->stack().front()->set_channels(channels);
+ update_signals();
+}
+#ifdef ENABLE_DECODE
+shared_ptr Session::add_decode_signal()
+{
+ shared_ptr signal;
+
+ try {
// Create the decode signal
- shared_ptr signal =
- make_shared(decoder_stack, signalbases_);
+ signal = make_shared(*this);
- signalbases_.insert(signal);
+ signalbases_.push_back(signal);
- for (shared_ptr view : views_)
+ // Add the decode signal to all views
+ for (shared_ptr& view : views_)
view->add_decode_signal(signal);
- } catch (runtime_error e) {
- return false;
+ } catch (runtime_error& e) {
+ remove_decode_signal(signal);
+ return nullptr;
}
signals_changed();
- // Do an initial decode
- decoder_stack->begin_decode();
-
- return true;
+ return signal;
}
void Session::remove_decode_signal(shared_ptr signal)
{
- signalbases_.erase(signal);
+ if (shutting_down_)
+ return;
- for (shared_ptr view : views_)
+ signalbases_.erase(std::remove_if(signalbases_.begin(), signalbases_.end(),
+ [&](shared_ptr s) { return s == signal; }),
+ signalbases_.end());
+
+ for (shared_ptr& view : views_)
view->remove_decode_signal(signal);
signals_changed();
}
#endif
+bool Session::all_segments_complete(uint32_t segment_id) const
+{
+ bool all_complete = true;
+
+ for (const shared_ptr& base : signalbases_)
+ if (!base->segment_is_complete(segment_id))
+ all_complete = false;
+
+ return all_complete;
+}
+
+MetadataObjManager* Session::metadata_obj_manager()
+{
+ return &metadata_obj_manager_;
+}
+
void Session::set_capture_state(capture_state state)
{
bool changed;
+ if (state == Running)
+ acq_time_.restart();
+ if (state == Stopped)
+ qDebug("Acquisition took %.2f s", acq_time_.elapsed() / 1000.);
+
{
lock_guard lock(sampling_mutex_);
changed = capture_state_ != state;
@@ -720,8 +979,8 @@ void Session::update_signals()
if (!device_) {
signalbases_.clear();
logic_data_.reset();
- for (shared_ptr view : views_) {
- view->clear_signals();
+ for (shared_ptr& view : views_) {
+ view->clear_signalbases();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
#endif
@@ -735,8 +994,8 @@ void Session::update_signals()
if (!sr_dev) {
signalbases_.clear();
logic_data_.reset();
- for (shared_ptr view : views_) {
- view->clear_signals();
+ for (shared_ptr& view : views_) {
+ view->clear_signalbases();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
#endif
@@ -751,7 +1010,7 @@ void Session::update_signals()
[] (shared_ptr channel) {
return channel->type() == sigrok::ChannelType::LOGIC; });
- // Create data containers for the logic data segments
+ // Create a common data container for the logic signalbases
{
lock_guard data_lock(data_mutex_);
@@ -759,91 +1018,96 @@ void Session::update_signals()
logic_data_.reset();
} else if (!logic_data_ ||
logic_data_->num_channels() != logic_channel_count) {
- logic_data_.reset(new data::Logic(
- logic_channel_count));
+ logic_data_.reset(new data::Logic(logic_channel_count));
assert(logic_data_);
}
}
- // Make the signals list
- for (shared_ptr viewbase : views_) {
- views::trace::View *trace_view =
- qobject_cast(viewbase.get());
-
- if (trace_view) {
- unordered_set< shared_ptr >
- prev_sigs(trace_view->signals());
- trace_view->clear_signals();
-
- for (auto channel : sr_dev->channels()) {
- shared_ptr signalbase;
- shared_ptr signal;
-
- // Find the channel in the old signals
- const auto iter = find_if(
- prev_sigs.cbegin(), prev_sigs.cend(),
- [&](const shared_ptr &s) {
- return s->base()->channel() == channel;
- });
- if (iter != prev_sigs.end()) {
- // Copy the signal from the old set to the new
- signal = *iter;
- trace_view->add_signal(signal);
- } else {
- // Find the signalbase for this channel if possible
- signalbase.reset();
- for (const shared_ptr b : signalbases_)
- if (b->channel() == channel)
- signalbase = b;
-
- switch(channel->type()->id()) {
- case SR_CHANNEL_LOGIC:
- if (!signalbase) {
- signalbase = make_shared(channel,
- data::SignalBase::LogicChannel);
- signalbases_.insert(signalbase);
-
- all_signal_data_.insert(logic_data_);
- signalbase->set_data(logic_data_);
-
- connect(this, SIGNAL(capture_state_changed(int)),
- signalbase.get(), SLOT(on_capture_state_changed(int)));
- }
-
- signal = shared_ptr(
- new views::trace::LogicSignal(*this,
- device_, signalbase));
- trace_view->add_signal(signal);
- break;
+ // Create signalbases if necessary
+ for (auto channel : sr_dev->channels()) {
- case SR_CHANNEL_ANALOG:
- {
- if (!signalbase) {
- signalbase = make_shared(channel,
- data::SignalBase::AnalogChannel);
- signalbases_.insert(signalbase);
-
- shared_ptr data(new data::Analog());
- all_signal_data_.insert(data);
- signalbase->set_data(data);
-
- connect(this, SIGNAL(capture_state_changed(int)),
- signalbase.get(), SLOT(on_capture_state_changed(int)));
- }
-
- signal = shared_ptr(
- new views::trace::AnalogSignal(
- *this, signalbase));
- trace_view->add_signal(signal);
- break;
- }
+ // Try to find the channel in the list of existing signalbases
+ const auto iter = find_if(signalbases_.cbegin(), signalbases_.cend(),
+ [&](const shared_ptr &sb) { return sb->channel() == channel; });
+
+ // Not found, let's make a signalbase for it
+ if (iter == signalbases_.cend()) {
+ shared_ptr signalbase;
+ switch(channel->type()->id()) {
+ case SR_CHANNEL_LOGIC:
+ signalbase = make_shared(channel, data::SignalBase::LogicChannel);
+ signalbases_.push_back(signalbase);
+
+ all_signal_data_.insert(logic_data_);
+ signalbase->set_data(logic_data_);
+
+ connect(this, SIGNAL(capture_state_changed(int)),
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
+ break;
+
+ case SR_CHANNEL_ANALOG:
+ signalbase = make_shared(channel, data::SignalBase::AnalogChannel);
+ signalbases_.push_back(signalbase);
+
+ shared_ptr data(new data::Analog());
+ all_signal_data_.insert(data);
+ signalbase->set_data(data);
+
+ connect(this, SIGNAL(capture_state_changed(int)),
+ signalbase.get(), SLOT(on_capture_state_changed(int)));
+ break;
+ }
+ }
+ }
- default:
- assert(false);
+ // Create and assign default signal groups if needed
+ if (signal_groups_.empty()) {
+ for (auto& entry : sr_dev->channel_groups()) {
+ const shared_ptr& group = entry.second;
+
+ if (group->channels().size() <= 1)
+ continue;
+
+ SignalGroup* sg = new SignalGroup(QString::fromStdString(entry.first));
+ for (const shared_ptr& channel : group->channels()) {
+ for (shared_ptr s : signalbases_) {
+ if (s->channel() == channel) {
+ sg->append_signal(s);
break;
}
}
}
+ signal_groups_.emplace_back(sg);
+ }
+ }
+
+ // Update all views
+ for (shared_ptr& viewbase : views_) {
+ vector< shared_ptr > view_signalbases =
+ viewbase->signalbases();
+
+ // Add all non-decode signalbases that don't yet exist in the view
+ for (shared_ptr& session_sb : signalbases_) {
+ if (session_sb->type() == SignalBase::DecodeChannel)
+ continue;
+
+ const auto iter = find_if(view_signalbases.cbegin(), view_signalbases.cend(),
+ [&](const shared_ptr &sb) { return sb == session_sb; });
+
+ if (iter == view_signalbases.cend())
+ viewbase->add_signalbase(session_sb);
+ }
+
+ // Remove all non-decode signalbases that no longer exist
+ for (shared_ptr& view_sb : view_signalbases) {
+ if (view_sb->type() == SignalBase::DecodeChannel)
+ continue;
+
+ const auto iter = find_if(signalbases_.cbegin(), signalbases_.cend(),
+ [&](const shared_ptr &sb) { return sb == view_sb; });
+
+ if (iter == signalbases_.cend())
+ viewbase->remove_signalbase(view_sb);
}
}
@@ -865,16 +1129,59 @@ void Session::sample_thread_proc(function error_handler)
{
assert(error_handler);
+#ifdef ENABLE_FLOW
+ pipeline_ = Pipeline::create();
+
+ source_ = ElementFactory::create_element("filesrc", "source");
+ sink_ = RefPtr::cast_dynamic(ElementFactory::create_element("appsink", "sink"));
+
+ pipeline_->add(source_)->add(sink_);
+ source_->link(sink_);
+
+ source_->set_property("location", Glib::ustring("/tmp/dummy_binary"));
+
+ sink_->set_property("emit-signals", TRUE);
+ sink_->signal_new_sample().connect(sigc::mem_fun(*this, &Session::on_gst_new_sample));
+
+ // Get the bus from the pipeline and add a bus watch to the default main context
+ RefPtr bus = pipeline_->get_bus();
+ bus->add_watch(sigc::mem_fun(this, &Session::on_gst_bus_message));
+
+ // Start pipeline and Wait until it finished processing
+ pipeline_done_interrupt_ = false;
+ pipeline_->set_state(Gst::STATE_PLAYING);
+
+ unique_lock pipeline_done_lock_(pipeline_done_mutex_);
+ pipeline_done_cond_.wait(pipeline_done_lock_);
+
+ // Let the pipeline free all resources
+ pipeline_->set_state(Gst::STATE_NULL);
+
+#else
if (!device_)
return;
- cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
+ try {
+ cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
+ } catch (Error& e) {
+ cur_samplerate_ = 0;
+ }
out_of_memory_ = false;
+ {
+ lock_guard lock(data_mutex_);
+ cur_logic_segment_.reset();
+ cur_analog_segments_.clear();
+ for (shared_ptr sb : signalbases_)
+ sb->clear_sample_data();
+ }
+ highest_segment_id_ = -1;
+ frame_began_ = false;
+
try {
device_->start();
- } catch (Error e) {
+ } catch (Error& e) {
error_handler(e.what());
return;
}
@@ -884,19 +1191,22 @@ void Session::sample_thread_proc(function error_handler)
try {
device_->run();
- } catch (Error e) {
+ } catch (Error& e) {
error_handler(e.what());
set_capture_state(Stopped);
return;
+ } catch (QString& e) {
+ error_handler(e);
+ set_capture_state(Stopped);
+ return;
}
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
- if (cur_logic_segment_) {
- qDebug("SR_DF_END was not received.");
- assert(false);
- }
+ if (cur_logic_segment_)
+ qDebug() << "WARNING: SR_DF_END was not received.";
+#endif
// Optimize memory usage
free_unused_memory();
@@ -914,34 +1224,122 @@ void Session::sample_thread_proc(function error_handler)
void Session::free_unused_memory()
{
- for (shared_ptr data : all_signal_data_) {
+ for (const shared_ptr& data : all_signal_data_) {
const vector< shared_ptr > segments = data->segments();
- for (shared_ptr segment : segments) {
+ for (const shared_ptr& segment : segments)
segment->free_unused_memory();
+ }
+}
+
+void Session::signal_new_segment()
+{
+ int new_segment_id = 0;
+
+ if ((cur_logic_segment_ != nullptr) || !cur_analog_segments_.empty()) {
+
+ // Determine new frame/segment number, assuming that all
+ // signals have the same number of frames/segments
+ if (cur_logic_segment_) {
+ new_segment_id = logic_data_->get_segment_count() - 1;
+ } else {
+ shared_ptr any_channel =
+ (*cur_analog_segments_.begin()).first;
+
+ shared_ptr base = signalbase_from_channel(any_channel);
+ assert(base);
+
+ shared_ptr data(base->analog_data());
+ assert(data);
+
+ new_segment_id = data->get_segment_count() - 1;
}
}
+
+ if (new_segment_id > highest_segment_id_) {
+ highest_segment_id_ = new_segment_id;
+ new_segment(highest_segment_id_);
+ }
+}
+
+void Session::signal_segment_completed()
+{
+ int segment_id = 0;
+
+ for (const shared_ptr& signalbase : signalbases_) {
+ // We only care about analog and logic channels, not derived ones
+ if (signalbase->type() == data::SignalBase::AnalogChannel) {
+ segment_id = signalbase->analog_data()->get_segment_count() - 1;
+ break;
+ }
+
+ if (signalbase->type() == data::SignalBase::LogicChannel) {
+ segment_id = signalbase->logic_data()->get_segment_count() - 1;
+ break;
+ }
+ }
+
+ if (segment_id >= 0)
+ segment_completed(segment_id);
}
+#ifdef ENABLE_FLOW
+bool Session::on_gst_bus_message(const Glib::RefPtr& bus, const Glib::RefPtr& message)
+{
+ (void)bus;
+
+ if ((message->get_source() == pipeline_) && \
+ ((message->get_message_type() == Gst::MESSAGE_EOS)))
+ pipeline_done_cond_.notify_one();
+
+ // TODO Also evaluate MESSAGE_STREAM_STATUS to receive error notifications
+
+ return true;
+}
+
+Gst::FlowReturn Session::on_gst_new_sample()
+{
+ RefPtr sample = sink_->pull_sample();
+ RefPtr buf = sample->get_buffer();
+
+ for (uint32_t block_id = 0; block_id < buf->n_memory(); block_id++) {
+ RefPtr buf_mem = buf->get_memory(block_id);
+ Gst::MapInfo mapinfo;
+ buf_mem->map(mapinfo, Gst::MAP_READ);
+
+ shared_ptr logic_packet =
+ sr_context->create_logic_packet(mapinfo.get_data(), buf->get_size(), 1);
+
+ try {
+ feed_in_logic(dynamic_pointer_cast(logic_packet->payload()));
+ } catch (bad_alloc&) {
+ out_of_memory_ = true;
+ device_->stop();
+ buf_mem->unmap(mapinfo);
+ return Gst::FLOW_ERROR;
+ }
+
+ buf_mem->unmap(mapinfo);
+ }
+
+ return Gst::FLOW_OK;
+}
+#endif
+
void Session::feed_in_header()
{
- cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
+ // Nothing to do here for now
}
void Session::feed_in_meta(shared_ptr meta)
{
- for (auto entry : meta->config()) {
+ 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
+ cur_samplerate_ = g_variant_get_uint64(entry.second.gobj());
break;
default:
- // Unknown metadata is not an error.
+ qDebug() << "Received meta data key" << entry.first->id() << ", ignoring.";
break;
}
}
@@ -955,7 +1353,7 @@ void Session::feed_in_trigger()
uint64_t sample_count = 0;
{
- for (const shared_ptr d : all_signal_data_) {
+ for (const shared_ptr& d : all_signal_data_) {
assert(d);
uint64_t temp_count = 0;
@@ -969,17 +1367,73 @@ void Session::feed_in_trigger()
}
}
- trigger_event(sample_count / get_samplerate());
+ uint32_t segment_id = 0; // Default segment when no frames are used
+
+ // If a frame began, we'd ideally be able to use the highest segment ID for
+ // the trigger. However, as new segments are only created when logic or
+ // analog data comes in, this doesn't work if the trigger appears right
+ // after the beginning of the frame, before any sample data.
+ // For this reason, we use highest segment ID + 1 if no sample data came in
+ // yet and the highest segment ID otherwise.
+ if (frame_began_) {
+ segment_id = highest_segment_id_;
+ if (!cur_logic_segment_ && (cur_analog_segments_.size() == 0))
+ segment_id++;
+ }
+
+ // TODO Create timestamp from segment start time + segment's current sample count
+ util::Timestamp timestamp = sample_count / get_samplerate();
+ trigger_list_.emplace_back(segment_id, timestamp);
+ trigger_event(segment_id, timestamp);
}
void Session::feed_in_frame_begin()
{
- if (cur_logic_segment_ || !cur_analog_segments_.empty())
- frame_began();
+ frame_began_ = true;
}
-void Session::feed_in_logic(shared_ptr logic)
+void Session::feed_in_frame_end()
{
+ if (!frame_began_)
+ return;
+
+ {
+ lock_guard lock(data_mutex_);
+
+ if (cur_logic_segment_)
+ cur_logic_segment_->set_complete();
+
+ for (auto& entry : cur_analog_segments_) {
+ shared_ptr segment = entry.second;
+ segment->set_complete();
+ }
+
+ cur_logic_segment_.reset();
+ cur_analog_segments_.clear();
+ }
+
+ frame_began_ = false;
+
+ signal_segment_completed();
+}
+
+void Session::feed_in_logic(shared_ptr logic)
+{
+ if (logic->data_length() == 0) {
+ qDebug() << "WARNING: Received logic packet with 0 samples.";
+ return;
+ }
+
+ if (logic->unit_size() > 8)
+ throw QString(tr("Can't handle more than 64 logic channels."));
+
+ if (!cur_samplerate_)
+ try {
+ cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
+ } catch (Error& e) {
+ // Do nothing
+ }
+
lock_guard lock(data_mutex_);
if (!logic_data_) {
@@ -995,14 +1449,11 @@ void Session::feed_in_logic(shared_ptr logic)
// Create a new data segment
cur_logic_segment_ = make_shared(
- *logic_data_, logic->unit_size(), cur_samplerate_);
+ *logic_data_, logic_data_->get_segment_count(),
+ logic->unit_size(), cur_samplerate_);
logic_data_->push_segment(cur_logic_segment_);
- // @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();
+ signal_new_segment();
}
cur_logic_segment_->append_payload(logic);
@@ -1010,23 +1461,33 @@ void Session::feed_in_logic(shared_ptr logic)
data_received();
}
-void Session::feed_in_analog(shared_ptr analog)
+void Session::feed_in_analog(shared_ptr analog)
{
+ if (analog->num_samples() == 0) {
+ qDebug() << "WARNING: Received analog packet with 0 samples.";
+ return;
+ }
+
+ if (!cur_samplerate_)
+ try {
+ cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
+ } catch (Error& e) {
+ // Do nothing
+ }
+
lock_guard lock(data_mutex_);
const vector> channels = analog->channels();
- const unsigned int channel_count = channels.size();
- const size_t sample_count = analog->num_samples() / channel_count;
bool sweep_beginning = false;
- unique_ptr data(new float[analog->num_samples()]);
+ unique_ptr data(new float[analog->num_samples() * channels.size()]);
analog->get_data_as_float(data.get());
if (signalbases_.empty())
update_signals();
float *channel_data = data.get();
- for (auto channel : channels) {
+ for (auto& channel : channels) {
shared_ptr segment;
// Try to get the segment of the channel
@@ -1049,18 +1510,20 @@ void Session::feed_in_analog(shared_ptr analog)
// Create a segment, keep it in the maps of channels
segment = make_shared(
- *data, cur_samplerate_);
+ *data, data->get_segment_count(), cur_samplerate_);
cur_analog_segments_[channel] = segment;
// Push the segment into the analog data.
data->push_segment(segment);
+
+ signal_new_segment();
}
assert(segment);
// Append the samples in the segment
- segment->append_interleaved_samples(channel_data++, sample_count,
- channel_count);
+ segment->append_interleaved_samples(channel_data++, analog->num_samples(),
+ channels.size());
}
if (sweep_beginning) {
@@ -1074,8 +1537,6 @@ void Session::feed_in_analog(shared_ptr analog)
void Session::data_feed_in(shared_ptr device,
shared_ptr packet)
{
- static bool frame_began = false;
-
(void)device;
assert(device);
@@ -1095,15 +1556,10 @@ void Session::data_feed_in(shared_ptr device,
feed_in_trigger();
break;
- case SR_DF_FRAME_BEGIN:
- feed_in_frame_begin();
- frame_began = true;
- break;
-
case SR_DF_LOGIC:
try {
feed_in_logic(dynamic_pointer_cast(packet->payload()));
- } catch (bad_alloc) {
+ } catch (bad_alloc&) {
out_of_memory_ = true;
device_->stop();
}
@@ -1112,26 +1568,40 @@ void Session::data_feed_in(shared_ptr device,
case SR_DF_ANALOG:
try {
feed_in_analog(dynamic_pointer_cast(packet->payload()));
- } catch (bad_alloc) {
+ } catch (bad_alloc&) {
out_of_memory_ = true;
device_->stop();
}
break;
+ case SR_DF_FRAME_BEGIN:
+ feed_in_frame_begin();
+ break;
+
case SR_DF_FRAME_END:
+ feed_in_frame_end();
+ break;
+
case SR_DF_END:
- {
+ // Strictly speaking, this is performed when a frame end marker was
+ // received, so there's no point doing this again. However, not all
+ // devices use frames, and for those devices, we need to do it here.
{
lock_guard lock(data_mutex_);
+
+ if (cur_logic_segment_)
+ cur_logic_segment_->set_complete();
+
+ for (auto& entry : cur_analog_segments_) {
+ shared_ptr segment = entry.second;
+ segment->set_complete();
+ }
+
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
- if (frame_began) {
- frame_began = false;
- frame_ended();
- }
break;
- }
+
default:
break;
}
@@ -1142,4 +1612,19 @@ void Session::on_data_saved()
data_saved_ = true;
}
+#ifdef ENABLE_DECODE
+void Session::on_new_decoders_selected(vector decoders)
+{
+ assert(decoders.size() > 0);
+
+ shared_ptr signal = add_decode_signal();
+
+ if (signal)
+ for (unsigned int i = 0; i < decoders.size(); i++) {
+ const srd_decoder* d = decoders[i];
+ signal->stack_decoder(d, !(i < decoders.size() - 1));
+ }
+}
+#endif
+
} // namespace pv