X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=31ca328deca53bf1c9cfd90d426fb228da228af6;hp=97741ebf7b944a4c6507bd1a4e64c1d8128a5d5b;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=26a883ede0bcf68d087eda5dd2082890d36c7aef
diff --git a/pv/session.cpp b/pv/session.cpp
index 97741ebf..31ca328d 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,14 +17,6 @@
* along with this program; if not, see .
*/
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include
-#include
-
#include
#include
@@ -33,16 +25,16 @@
#include
-#include "session.hpp"
#include "devicemanager.hpp"
+#include "session.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"
-#include "data/decode/decoder.hpp"
#include "devices/hardwaredevice.hpp"
#include "devices/inputfile.hpp"
@@ -62,19 +54,21 @@
#include
#endif
-using boost::shared_lock;
-using boost::shared_mutex;
-using boost::unique_lock;
-
+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::make_pair;
+using std::make_shared;
using std::map;
+using std::max;
+using std::move;
using std::mutex;
using std::pair;
using std::recursive_mutex;
-using std::set;
+using std::runtime_error;
using std::shared_ptr;
using std::string;
using std::unordered_set;
@@ -82,22 +76,16 @@ using std::vector;
using sigrok::Analog;
using sigrok::Channel;
-using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::DatafeedCallbackFunction;
using sigrok::Error;
-using sigrok::Header;
using sigrok::InputFormat;
using sigrok::Logic;
using sigrok::Meta;
-using sigrok::OutputFormat;
using sigrok::Packet;
-using sigrok::PacketPayload;
using sigrok::Session;
-using sigrok::SessionDevice;
using Glib::VariantBase;
-using Glib::Variant;
namespace pv {
Session::Session(DeviceManager &device_manager, QString name) :
@@ -153,17 +141,17 @@ void Session::set_name(QString name)
name_changed();
}
-const std::list< std::shared_ptr > Session::views() const
+const list< shared_ptr > Session::views() const
{
return views_;
}
-std::shared_ptr Session::main_view() const
+shared_ptr Session::main_view() const
{
return main_view_;
}
-void Session::set_main_bar(std::shared_ptr main_bar)
+void Session::set_main_bar(shared_ptr main_bar)
{
main_bar_ = main_bar;
}
@@ -192,11 +180,11 @@ void Session::save_settings(QSettings &settings) const
settings.setValue("device_type", "hardware");
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");
+ key_list.emplace_back("vendor");
+ key_list.emplace_back("model");
+ key_list.emplace_back("version");
+ key_list.emplace_back("serial_num");
+ key_list.emplace_back("connection_id");
dev_info = device_manager_.get_device_info(device_);
@@ -228,7 +216,7 @@ void Session::save_settings(QSettings &settings) const
if (base->is_decode_signal()) {
shared_ptr decoder_stack =
base->decoder_stack();
- std::shared_ptr top_decoder =
+ shared_ptr top_decoder =
decoder_stack->stack().front();
settings.beginGroup("decoder_stack" + QString::number(stacks++));
@@ -276,11 +264,11 @@ void Session::restore_settings(QSettings &settings)
// 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");
+ key_list.emplace_back("vendor");
+ key_list.emplace_back("model");
+ key_list.emplace_back("version");
+ key_list.emplace_back("serial_num");
+ key_list.emplace_back("connection_id");
for (string key : key_list) {
const QString k = QString::fromStdString(key);
@@ -289,7 +277,7 @@ void Session::restore_settings(QSettings &settings)
const string value = settings.value(k).toString().toStdString();
if (!value.empty())
- dev_info.insert(std::make_pair(key, value));
+ dev_info.insert(make_pair(key, value));
}
if (dev_info.count("model") > 0)
@@ -307,7 +295,7 @@ void Session::restore_settings(QSettings &settings)
settings.endGroup();
if (QFileInfo(filename).isReadable()) {
- device = std::make_shared(device_manager_.context(),
+ device = make_shared(device_manager_.context(),
filename.toStdString());
set_device(device);
@@ -383,12 +371,12 @@ void Session::set_device(shared_ptr device)
device_.reset();
- // Revert name back to default name (e.g. "Untitled-1") as the data is gone
+ // Revert name back to default name (e.g. "Session 1") as the data is gone
name_ = default_name_;
name_changed();
// Remove all stored data
- for (std::shared_ptr view : views_) {
+ for (shared_ptr view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
@@ -409,22 +397,23 @@ void Session::set_device(shared_ptr device)
signals_changed();
- device_ = std::move(device);
+ device_ = move(device);
try {
device_->open();
} catch (const QString &e) {
device_.reset();
- device_changed();
- throw;
}
- device_->session()->add_datafeed_callback([=]
- (shared_ptr device, shared_ptr packet) {
- data_feed_in(device, packet);
- });
+ if (device_) {
+ device_->session()->add_datafeed_callback([=]
+ (shared_ptr device, shared_ptr packet) {
+ data_feed_in(device, packet);
+ });
+
+ update_signals();
+ }
- update_signals();
device_changed();
}
@@ -437,15 +426,13 @@ void Session::set_default_device()
return;
// Try and find the demo device and select that by default
- const auto iter = std::find_if(devices.begin(), devices.end(),
+ 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);
}
-void Session::load_init_file(const std::string &file_name,
- const std::string &format)
+void Session::load_init_file(const string &file_name, const string &format)
{
shared_ptr input_format;
@@ -468,8 +455,8 @@ void Session::load_init_file(const std::string &file_name,
}
void Session::load_file(QString file_name,
- std::shared_ptr format,
- const std::map &options)
+ shared_ptr format,
+ const map &options)
{
const QString errorMessage(
QString("Failed to load file %1").arg(file_name));
@@ -520,7 +507,7 @@ void Session::start_capture(function error_handler)
const shared_ptr sr_dev = device_->device();
if (sr_dev) {
const auto channels = sr_dev->channels();
- if (!std::any_of(channels.begin(), channels.end(),
+ if (!any_of(channels.begin(), channels.end(),
[](shared_ptr channel) {
return channel->enabled(); })) {
error_handler(tr("No channels enabled."));
@@ -532,9 +519,15 @@ void Session::start_capture(function error_handler)
for (const shared_ptr 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();
+ // 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 =
+ dynamic_pointer_cast< devices::HardwareDevice >(device_);
+
+ if (hw_device) {
+ name_ = default_name_;
+ name_changed();
+ }
// Begin the session
sampling_thread_ = std::thread(
@@ -551,7 +544,7 @@ void Session::stop_capture()
sampling_thread_.join();
}
-void Session::register_view(std::shared_ptr view)
+void Session::register_view(shared_ptr view)
{
if (views_.empty()) {
main_view_ = view;
@@ -562,10 +555,9 @@ void Session::register_view(std::shared_ptr view)
update_signals();
}
-void Session::deregister_view(std::shared_ptr view)
+void Session::deregister_view(shared_ptr view)
{
- views_.remove_if([&](std::shared_ptr v) {
- return v == view; });
+ views_.remove_if([&](shared_ptr v) { return v == view; });
if (views_.empty()) {
main_view_.reset();
@@ -575,9 +567,9 @@ void Session::deregister_view(std::shared_ptr view)
}
}
-bool Session::has_view(std::shared_ptr view)
+bool Session::has_view(shared_ptr view)
{
- for (std::shared_ptr v : views_)
+ for (shared_ptr v : views_)
if (v == view)
return true;
@@ -593,7 +585,7 @@ double Session::get_samplerate() const
const vector< shared_ptr > segments =
d->segments();
for (const shared_ptr &s : segments)
- samplerate = std::max(samplerate, s->samplerate());
+ samplerate = max(samplerate, s->samplerate());
}
// If there is no sample rate given we use samples as unit
if (samplerate == 0.0)
@@ -602,8 +594,7 @@ double Session::get_samplerate() const
return samplerate;
}
-const std::unordered_set< std::shared_ptr >
- Session::signalbases() const
+const unordered_set< shared_ptr > Session::signalbases() const
{
return signalbases_;
}
@@ -611,16 +602,18 @@ const std::unordered_set< std::shared_ptr >
#ifdef ENABLE_DECODE
bool Session::add_decoder(srd_decoder *const dec)
{
+ if (!dec)
+ return false;
+
map > channels;
shared_ptr decoder_stack;
try {
// Create the decoder
- decoder_stack = shared_ptr(
- new data::DecoderStack(*this, dec));
+ decoder_stack = make_shared(*this, dec);
// Make a list of all the channels
- std::vector all_channels;
+ vector 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)
@@ -629,7 +622,7 @@ bool Session::add_decoder(srd_decoder *const dec)
// Auto select the initial channels
for (const srd_channel *pdch : all_channels)
for (shared_ptr b : signalbases_) {
- if (b->type() == ChannelType::LOGIC) {
+ if (b->logic_data()) {
if (QString::fromUtf8(pdch->name).toLower().
contains(b->name().toLower()))
channels[pdch] = b;
@@ -643,14 +636,14 @@ bool Session::add_decoder(srd_decoder *const dec)
// Create the decode signal
shared_ptr signalbase =
- shared_ptr(new data::SignalBase(nullptr));
+ make_shared(nullptr, data::SignalBase::DecodeChannel);
signalbase->set_decoder_stack(decoder_stack);
signalbases_.insert(signalbase);
- for (std::shared_ptr view : views_)
+ for (shared_ptr view : views_)
view->add_decode_signal(signalbase);
- } catch (std::runtime_error e) {
+ } catch (runtime_error e) {
return false;
}
@@ -666,7 +659,7 @@ void Session::remove_decode_signal(shared_ptr signalbase)
{
signalbases_.erase(signalbase);
- for (std::shared_ptr view : views_)
+ for (shared_ptr view : views_)
view->remove_decode_signal(signalbase);
signals_changed();
@@ -692,7 +685,7 @@ void Session::update_signals()
if (!device_) {
signalbases_.clear();
logic_data_.reset();
- for (std::shared_ptr view : views_) {
+ for (shared_ptr view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
@@ -707,7 +700,7 @@ void Session::update_signals()
if (!sr_dev) {
signalbases_.clear();
logic_data_.reset();
- for (std::shared_ptr view : views_) {
+ for (shared_ptr view : views_) {
view->clear_signals();
#ifdef ENABLE_DECODE
view->clear_decode_signals();
@@ -718,10 +711,10 @@ void Session::update_signals()
// Detect what data types we will receive
auto channels = sr_dev->channels();
- unsigned int logic_channel_count = std::count_if(
+ unsigned int logic_channel_count = count_if(
channels.begin(), channels.end(),
[] (shared_ptr channel) {
- return channel->type() == ChannelType::LOGIC; });
+ return channel->type() == sigrok::ChannelType::LOGIC; });
// Create data containers for the logic data segments
{
@@ -738,7 +731,7 @@ void Session::update_signals()
}
// Make the signals list
- for (std::shared_ptr viewbase : views_) {
+ for (shared_ptr viewbase : views_) {
views::TraceView::View *trace_view =
qobject_cast(viewbase.get());
@@ -752,7 +745,7 @@ void Session::update_signals()
shared_ptr signal;
// Find the channel in the old signals
- const auto iter = std::find_if(
+ const auto iter = find_if(
prev_sigs.cbegin(), prev_sigs.cend(),
[&](const shared_ptr &s) {
return s->base()->channel() == channel;
@@ -771,12 +764,15 @@ void Session::update_signals()
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
if (!signalbase) {
- signalbase = shared_ptr(
- new data::SignalBase(channel));
+ 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(
@@ -788,13 +784,16 @@ void Session::update_signals()
case SR_CHANNEL_ANALOG:
{
if (!signalbase) {
- signalbase = shared_ptr(
- new data::SignalBase(channel));
+ 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(
@@ -805,7 +804,7 @@ void Session::update_signals()
}
default:
- assert(0);
+ assert(false);
break;
}
}
@@ -854,9 +853,12 @@ void Session::sample_thread_proc(function error_handler)
// Confirm that SR_DF_END was received
if (cur_logic_segment_) {
qDebug("SR_DF_END was not received.");
- assert(0);
+ assert(false);
}
+ // Optimize memory usage
+ free_unused_memory();
+
// We now have unsaved data unless we just "captured" from a file
shared_ptr file_device =
dynamic_pointer_cast(device_);
@@ -868,6 +870,17 @@ void Session::sample_thread_proc(function error_handler)
error_handler(tr("Out of memory, acquisition stopped."));
}
+void Session::free_unused_memory()
+{
+ for (shared_ptr data : all_signal_data_) {
+ const vector< shared_ptr > segments = data->segments();
+
+ for (shared_ptr segment : segments) {
+ segment->free_unused_memory();
+ }
+ }
+}
+
void Session::feed_in_header()
{
cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
@@ -939,8 +952,8 @@ void Session::feed_in_logic(shared_ptr logic)
set_capture_state(Running);
// Create a new data segment
- cur_logic_segment_ = shared_ptr(
- new data::LogicSegment(logic, cur_samplerate_));
+ cur_logic_segment_ = make_shared(
+ *logic_data_, logic->unit_size(), cur_samplerate_);
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
@@ -948,11 +961,10 @@ void Session::feed_in_logic(shared_ptr logic)
// frame_began is DecoderStack, but in future we need to signal
// this after both analog and logic sweeps have begun.
frame_began();
- } else {
- // Append to the existing data segment
- cur_logic_segment_->append_payload(logic);
}
+ cur_logic_segment_->append_payload(logic);
+
data_received();
}
@@ -983,11 +995,6 @@ void Session::feed_in_analog(shared_ptr analog)
// in the sweep containing this segment.
sweep_beginning = true;
- // Create a segment, keep it in the maps of channels
- segment = shared_ptr(
- new data::AnalogSegment(cur_samplerate_));
- cur_analog_segments_[channel] = segment;
-
// Find the analog data associated with the channel
shared_ptr base = signalbase_from_channel(channel);
assert(base);
@@ -995,6 +1002,11 @@ void Session::feed_in_analog(shared_ptr analog)
shared_ptr data(base->analog_data());
assert(data);
+ // Create a segment, keep it in the maps of channels
+ segment = make_shared(
+ *data, cur_samplerate_);
+ cur_analog_segments_[channel] = segment;
+
// Push the segment into the analog data.
data->push_segment(segment);
}
@@ -1017,6 +1029,8 @@ 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);
@@ -1038,12 +1052,13 @@ void Session::data_feed_in(shared_ptr device,
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 (std::bad_alloc) {
+ } catch (bad_alloc) {
out_of_memory_ = true;
device_->stop();
}
@@ -1052,12 +1067,13 @@ void Session::data_feed_in(shared_ptr device,
case SR_DF_ANALOG:
try {
feed_in_analog(dynamic_pointer_cast(packet->payload()));
- } catch (std::bad_alloc) {
+ } catch (bad_alloc) {
out_of_memory_ = true;
device_->stop();
}
break;
+ case SR_DF_FRAME_END:
case SR_DF_END:
{
{
@@ -1065,7 +1081,10 @@ void Session::data_feed_in(shared_ptr device,
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
- frame_ended();
+ if (frame_began) {
+ frame_began = false;
+ frame_ended();
+ }
break;
}
default: