X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=c18575ad415559a8e66fa0fae7a6b65774a53c59;hb=ba0c5f899c654a22506adb799f23f718421bf453;hp=07917e582ff2846d537fecaf755dfa4e125daae7;hpb=132a5c6d4b3c220d1cb6d942bf9d7e8b180ab1c3;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index 07917e5..c18575a 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,6 +17,7 @@
* along with this program; if not, see .
*/
+#include
#include
#include
@@ -32,7 +33,6 @@
#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"
@@ -91,6 +91,9 @@ using sigrok::Session;
using Glib::VariantBase;
namespace pv {
+
+shared_ptr Session::sr_context;
+
Session::Session(DeviceManager &device_manager, QString name) :
device_manager_(device_manager),
default_name_(name),
@@ -173,7 +176,7 @@ void Session::save_settings(QSettings &settings) const
{
map dev_info;
list key_list;
- int stacks = 0, views = 0;
+ int decode_signals = 0, views = 0;
if (device_) {
shared_ptr hw_device =
@@ -217,14 +220,8 @@ void Session::save_settings(QSettings &settings) const
for (shared_ptr base : signalbases_) {
#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.beginGroup("decode_signal" + QString::number(decode_signals++));
+ base->save_settings(settings);
settings.endGroup();
} else
#endif
@@ -235,7 +232,7 @@ void Session::save_settings(QSettings &settings) const
}
}
- settings.setValue("decoder_stacks", stacks);
+ settings.setValue("decode_signals", decode_signals);
// Save view states and their signal settings
// Note: main_view must be saved as view0
@@ -319,14 +316,12 @@ void Session::restore_settings(QSettings &settings)
// 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()));
+ 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
@@ -605,7 +600,42 @@ void Session::register_view(shared_ptr view)
views_.push_back(view);
+ // Add all device signals
update_signals();
+
+ // Add all other signals
+ unordered_set< shared_ptr > view_signalbases =
+ view->signalbases();
+
+ views::trace::View *trace_view =
+ qobject_cast(view.get());
+
+ if (trace_view) {
+ for (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 as it doesn't have it yet
+ if (!sb_exists)
+ switch (signalbase->type()) {
+ case data::SignalBase::AnalogChannel:
+ case data::SignalBase::LogicChannel:
+ case data::SignalBase::DecodeChannel:
+#ifdef ENABLE_DECODE
+ trace_view->add_decode_signal(
+ dynamic_pointer_cast(signalbase));
+#endif
+ break;
+ case data::SignalBase::MathChannel:
+ // TBD
+ break;
+ }
+ }
+ }
+
+ signals_changed();
}
void Session::deregister_view(shared_ptr view)
@@ -647,47 +677,56 @@ double Session::get_samplerate() const
return samplerate;
}
+uint32_t Session::get_segment_count() const
+{
+ uint32_t value = 0;
+
+ // Find the highest number of segments
+ for (shared_ptr data : all_signal_data_)
+ if (data->get_segment_count() > value)
+ value = data->get_segment_count();
+
+ return value;
+}
+
const unordered_set< shared_ptr > Session::signalbases() const
{
return signalbases_;
}
-#ifdef ENABLE_DECODE
-bool Session::add_decoder(srd_decoder *const dec)
+bool Session::all_segments_complete(uint32_t segment_id) const
{
- if (!dec)
- return false;
+ bool all_complete = true;
- map > channels;
- shared_ptr decoder_stack;
+ for (shared_ptr base : signalbases_)
+ if (!base->segment_is_complete(segment_id))
+ all_complete = false;
- try {
- // Create the decoder
- decoder_stack = make_shared(*this, dec);
+ return all_complete;
+}
- assert(decoder_stack);
- assert(!decoder_stack->stack().empty());
- assert(decoder_stack->stack().front());
- decoder_stack->stack().front()->set_channels(channels);
+#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);
+ // Add the decode signal to all views
for (shared_ptr view : views_)
view->add_decode_signal(signal);
} catch (runtime_error e) {
- return false;
+ 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)
@@ -872,6 +911,13 @@ void Session::sample_thread_proc(function error_handler)
out_of_memory_ = false;
+ {
+ lock_guard lock(data_mutex_);
+ cur_logic_segment_.reset();
+ cur_analog_segments_.clear();
+ }
+ highest_segment_id_ = -1;
+
try {
device_->start();
} catch (Error e) {
@@ -923,9 +969,60 @@ void Session::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 (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);
+}
+
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)
@@ -974,12 +1071,40 @@ void Session::feed_in_trigger()
void Session::feed_in_frame_begin()
{
- if (cur_logic_segment_ || !cur_analog_segments_.empty())
- frame_began();
+ frame_began_ = true;
+}
+
+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();
+ }
+
+ if (frame_began_)
+ frame_began_ = false;
+
+ signal_segment_completed();
}
void Session::feed_in_logic(shared_ptr logic)
{
+ if (!cur_samplerate_)
+ cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
+
lock_guard lock(data_mutex_);
if (!logic_data_) {
@@ -995,14 +1120,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);
@@ -1012,6 +1134,9 @@ void Session::feed_in_logic(shared_ptr logic)
void Session::feed_in_analog(shared_ptr analog)
{
+ if (!cur_samplerate_)
+ cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE);
+
lock_guard lock(data_mutex_);
const vector> channels = analog->channels();
@@ -1019,7 +1144,7 @@ void Session::feed_in_analog(shared_ptr analog)
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()]);
analog->get_data_as_float(data.get());
if (signalbases_.empty())
@@ -1049,11 +1174,13 @@ 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);
@@ -1074,8 +1201,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,11 +1220,6 @@ 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()));
@@ -1118,20 +1238,25 @@ void Session::data_feed_in(shared_ptr device,
}
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_);
cur_logic_segment_.reset();
cur_analog_segments_.clear();
}
- if (frame_began) {
- frame_began = false;
- frame_ended();
- }
break;
- }
+
default:
break;
}