X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=aa528d191fe6750958bd2cbf8491fe8bb35383d0;hb=e2649143f11fad802b85f124dba7ef3e81874e50;hp=0077ccfd00d0d36d6de0a401d8f71347e24a4d08;hpb=53bb2e1de75f5cca9244efc83c4e77a222e322f4;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index 0077ccf..aa528d1 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,32 +17,25 @@
* 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
+#include
#include
#include
#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"
@@ -50,11 +43,11 @@
#include "toolbars/mainbar.hpp"
-#include "view/analogsignal.hpp"
-#include "view/decodetrace.hpp"
-#include "view/logicsignal.hpp"
-#include "view/signal.hpp"
-#include "view/view.hpp"
+#include "views/trace/analogsignal.hpp"
+#include "views/trace/decodetrace.hpp"
+#include "views/trace/logicsignal.hpp"
+#include "views/trace/signal.hpp"
+#include "views/trace/view.hpp"
#include
@@ -62,43 +55,39 @@
#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::make_shared;
using std::string;
+using std::unique_ptr;
using std::unordered_set;
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) :
@@ -154,17 +143,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;
}
@@ -229,7 +218,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++));
@@ -290,7 +279,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)
@@ -389,7 +378,7 @@ void Session::set_device(shared_ptr device)
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();
@@ -410,7 +399,7 @@ void Session::set_device(shared_ptr device)
signals_changed();
- device_ = std::move(device);
+ device_ = move(device);
try {
device_->open();
@@ -439,15 +428,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;
@@ -470,8 +457,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));
@@ -522,7 +509,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."));
@@ -559,7 +546,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;
@@ -570,10 +557,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();
@@ -583,9 +569,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;
@@ -601,7 +587,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)
@@ -610,8 +596,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_;
}
@@ -619,6 +604,9 @@ 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;
@@ -627,7 +615,7 @@ bool Session::add_decoder(srd_decoder *const 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)
@@ -636,7 +624,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;
@@ -650,14 +638,14 @@ bool Session::add_decoder(srd_decoder *const dec)
// Create the decode signal
shared_ptr signalbase =
- make_shared(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;
}
@@ -673,7 +661,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();
@@ -699,7 +687,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();
@@ -714,7 +702,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();
@@ -725,10 +713,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
{
@@ -745,23 +733,23 @@ void Session::update_signals()
}
// Make the signals list
- for (std::shared_ptr viewbase : views_) {
- views::TraceView::View *trace_view =
- qobject_cast(viewbase.get());
+ for (shared_ptr viewbase : views_) {
+ views::trace::View *trace_view =
+ qobject_cast(viewbase.get());
if (trace_view) {
- unordered_set< shared_ptr >
+ 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;
+ 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) {
+ [&](const shared_ptr &s) {
return s->base()->channel() == channel;
});
if (iter != prev_sigs.end()) {
@@ -778,15 +766,19 @@ void Session::update_signals()
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
if (!signalbase) {
- signalbase = make_shared(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(
- new views::TraceView::LogicSignal(*this,
+ signal = shared_ptr(
+ new views::trace::LogicSignal(*this,
device_, signalbase));
trace_view->add_signal(signal);
break;
@@ -794,23 +786,27 @@ void Session::update_signals()
case SR_CHANNEL_ANALOG:
{
if (!signalbase) {
- signalbase = make_shared(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(
- new views::TraceView::AnalogSignal(
+ signal = shared_ptr(
+ new views::trace::AnalogSignal(
*this, signalbase));
trace_view->add_signal(signal);
break;
}
default:
- assert(0);
+ assert(false);
break;
}
}
@@ -853,13 +849,20 @@ void Session::sample_thread_proc(function error_handler)
set_capture_state(device_->session()->trigger() ?
AwaitingTrigger : Running);
- device_->run();
+ try {
+ device_->run();
+ } catch (Error e) {
+ error_handler(e.what());
+ 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(0);
+ assert(false);
}
// Optimize memory usage
@@ -959,7 +962,7 @@ void Session::feed_in_logic(shared_ptr logic)
// Create a new data segment
cur_logic_segment_ = make_shared(
- *logic_data_, logic, cur_samplerate_);
+ *logic_data_, logic->unit_size(), cur_samplerate_);
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
@@ -967,11 +970,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();
}
@@ -982,12 +984,15 @@ void Session::feed_in_analog(shared_ptr analog)
const vector> channels = analog->channels();
const unsigned int channel_count = channels.size();
const size_t sample_count = analog->num_samples() / channel_count;
- const float *data = static_cast(analog->data_pointer());
bool sweep_beginning = false;
+ unique_ptr data(new float[analog->num_samples()]);
+ analog->get_data_as_float(data.get());
+
if (signalbases_.empty())
update_signals();
+ float *channel_data = data.get();
for (auto channel : channels) {
shared_ptr segment;
@@ -1021,7 +1026,7 @@ void Session::feed_in_analog(shared_ptr analog)
assert(segment);
// Append the samples in the segment
- segment->append_interleaved_samples(data++, sample_count,
+ segment->append_interleaved_samples(channel_data++, sample_count,
channel_count);
}
@@ -1036,7 +1041,7 @@ void Session::feed_in_analog(shared_ptr analog)
void Session::data_feed_in(shared_ptr device,
shared_ptr packet)
{
- static bool frame_began=false;
+ static bool frame_began = false;
(void)device;
@@ -1065,7 +1070,7 @@ void Session::data_feed_in(shared_ptr device,
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();
}
@@ -1074,7 +1079,7 @@ 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();
}