#include <pv/globalsettings.hpp>
#include <pv/session.hpp>
+using std::dynamic_pointer_cast;
using std::lock_guard;
using std::make_shared;
using std::min;
stack_config_changed_ = true;
auto_assign_signals(dec);
commit_decoder_channels();
+ update_output_signals();
decoder_stacked((void*)dec.get());
logic_mux_data_ = make_shared<Logic>(ch_count);
}
- // Receive notifications when new sample data is available
- connect_input_notifiers();
-
if (get_input_segment_count() == 0)
set_error_message(tr("No input data"));
{
bool new_assignment = false;
+ // Disconnect all input signal notifications so we don't have duplicate connections
+ disconnect_input_notifiers();
+
// Try to auto-select channels that don't have signals assigned yet
for (decode::DecodeChannel& ch : channels_) {
// If a decoder is given, auto-assign only its channels
}
}
- if (match) {
+ // Prevent using a signal more than once as D1 would match e.g. D1 and D10
+ bool signal_not_already_used = true;
+ for (decode::DecodeChannel& ch : channels_)
+ if (ch.assigned_signal && (ch.assigned_signal == match))
+ signal_not_already_used = false;
+
+ if (match && signal_not_already_used) {
ch.assigned_signal = match;
new_assignment = true;
}
}
if (new_assignment) {
+ // Receive notifications when new sample data is available
+ connect_input_notifiers();
+
logic_mux_data_invalid_ = true;
stack_config_changed_ = true;
commit_decoder_channels();
void DecodeSignal::assign_signal(const uint16_t channel_id, shared_ptr<const SignalBase> signal)
{
+ // Disconnect all input signal notifications so we don't have duplicate connections
+ disconnect_input_notifiers();
+
for (decode::DecodeChannel& ch : channels_)
if (ch.id == channel_id) {
ch.assigned_signal = signal;
logic_mux_data_invalid_ = true;
}
+ // Receive notifications when new sample data is available
+ connect_input_notifiers();
+
stack_config_changed_ = true;
commit_decoder_channels();
channels_updated();
[](decode::DecodeChannel ch) { return ch.assigned_signal.get(); });
}
+void DecodeSignal::update_output_signals()
+{
+ for (const shared_ptr<decode::Decoder>& dec : stack_) {
+ assert(dec);
+
+ if (dec->has_logic_output()) {
+ const vector<decode::DecoderLogicOutputChannel> logic_channels =
+ dec->logic_output_channels();
+
+ // All signals of a decoder share the same LogicSegment, so it's
+ // sufficient to check for the first channel only
+ const decode::DecoderLogicOutputChannel& first_ch = logic_channels[0];
+
+ bool ch_exists = false;
+ for (const shared_ptr<SignalBase>& signal : output_signals_)
+ if (signal->internal_name() == first_ch.id)
+ ch_exists = true;
+
+ if (!ch_exists) {
+ shared_ptr<Logic> logic_data = make_shared<Logic>(logic_channels.size());
+ output_logic_[dec->get_srd_decoder()] = logic_data;
+
+ shared_ptr<LogicSegment> logic_segment = make_shared<data::LogicSegment>(
+ *logic_data, 0, (logic_data->num_channels() + 7) / 8, first_ch.samplerate);
+ logic_data->push_segment(logic_segment);
+
+ uint index = 0;
+ for (const decode::DecoderLogicOutputChannel& logic_ch : logic_channels) {
+ shared_ptr<data::SignalBase> signal =
+ make_shared<data::SignalBase>(nullptr, LogicChannel);
+ signal->set_internal_name(logic_ch.id);
+ signal->set_name(logic_ch.id);
+ signal->set_index(index);
+ signal->set_data(logic_data);
+ output_signals_.push_back(signal);
+ session_.add_generated_signal(signal);
+ index++;
+ }
+ }
+ }
+ }
+
+ // TODO Delete signals that no longer have a corresponding decoder (also from session)
+ // TODO Check whether all sample rates are the same as the session's
+ // TODO Set colors to the same as the decoder's background color
+}
+
void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int init_state)
{
for (decode::DecodeChannel& ch : channels_)
return rows;
}
-
uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id) const
{
if (segment_id >= segments_.size())
settings.endGroup();
}
+
+ // TODO Save logic output signal settings
}
void DecodeSignal::restore_settings(QSettings &settings)
settings.endGroup();
}
+ connect_input_notifiers();
+
// Update the internal structures
stack_config_changed_ = true;
update_channel_list();
commit_decoder_channels();
+ update_output_signals();
+
+ // TODO Restore logic output signal settings
begin_decode();
}
return;
// Fetch the channel segments and their data
- bool segment_missing = false;
vector<shared_ptr<const LogicSegment> > segments;
vector<const uint8_t*> signal_data;
vector<uint8_t> signal_in_bytepos;
const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
shared_ptr<const LogicSegment> segment;
- try {
+ if (segment_id < logic_data->logic_segments().size()) {
segment = logic_data->logic_segments().at(segment_id)->get_shared_ptr();
- } catch (out_of_range&) {
+ } else {
qDebug() << "Muxer error for" << name() << ":" << ch.assigned_signal->name() \
<< "has no logic segment" << segment_id;
logic_mux_interrupt_ = true;
return;
}
- if (!segment) {
- segment_missing = true;
- break;
- }
+ if (!segment)
+ return;
segments.push_back(segment);
signal_in_bitpos.push_back(bitpos % 8);
}
- if (segment_missing)
- return;
-
shared_ptr<LogicSegment> output_segment;
try {
output_segment = logic_mux_data_->logic_segments().at(segment_id);
output_segment->set_complete();
if (segment_id < get_input_segment_count() - 1) {
+
// Process next segment
segment_id++;
logic_mux_data_->push_segment(output_segment);
output_segment->set_samplerate(get_input_samplerate(segment_id));
+ } else {
+ // Wait for more input data if we're processing the currently last segment
+ unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
+ logic_mux_cond_.wait(logic_mux_lock);
}
} else {
- // Wait for more input
+ // Input segments aren't all complete yet but samples_to_process is 0, wait for more input data
unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
logic_mux_cond_.wait(logic_mux_lock);
}
const int64_t chunk_sample_count = DecodeChunkLength / unit_size;
for (int64_t i = abs_start_samplenum;
- error_message_.isEmpty() && !decode_interrupt_ &&
- (i < (abs_start_samplenum + sample_count));
+ !decode_interrupt_ && (i < (abs_start_samplenum + sample_count));
i += chunk_sample_count) {
const int64_t chunk_end = min(i + chunk_sample_count,
// If the input segment is complete, we've exhausted this segment
if (input_segment->is_complete()) {
- if (current_segment_id_ < logic_mux_data_->logic_segments().size() - 1) {
+ if (current_segment_id_ < (logic_mux_data_->logic_segments().size() - 1)) {
// Process next segment
current_segment_id_++;
terminate_srd_session();
} else {
// All segments have been processed
- decode_finished();
+ if (!decode_interrupt_)
+ decode_finished();
+
+ // Wait for more input data
+ unique_lock<mutex> input_wait_lock(input_mutex_);
+ decode_input_cond_.wait(input_wait_lock);
}
} else {
- // Wait for more input data
+ // Input segment isn't complete yet but samples_to_process is 0, wait for more input data
unique_lock<mutex> input_wait_lock(input_mutex_);
decode_input_cond_.wait(input_wait_lock);
}
+
}
} while (!decode_interrupt_);
-
- // Potentially reap decoders when the application no longer is
- // interested in their (pending) results.
- if (decode_interrupt_)
- terminate_srd_session();
}
void DecodeSignal::start_srd_session()
srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_BINARY,
DecodeSignal::binary_callback, this);
+ srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_LOGIC,
+ DecodeSignal::logic_output_callback, this);
+
srd_session_start(srd_session_);
// We just recreated the srd session, so all stack changes are applied now
void DecodeSignal::connect_input_notifiers()
{
- // Disconnect the notification slot from the previous set of signals
- disconnect(this, SLOT(on_data_cleared()));
- disconnect(this, SLOT(on_data_received()));
-
// Connect the currently used signals to our slot
for (decode::DecodeChannel& ch : channels_) {
if (!ch.assigned_signal)
continue;
+ const data::SignalBase *signal = ch.assigned_signal.get();
+
+ connect(signal, SIGNAL(samples_cleared()),
+ this, SLOT(on_data_cleared()), Qt::UniqueConnection);
+ connect(signal, SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
+ this, SLOT(on_data_received()), Qt::UniqueConnection);
+
+ if (signal->logic_data())
+ connect(signal->logic_data().get(), SIGNAL(segment_completed()),
+ this, SLOT(on_input_segment_completed()), Qt::UniqueConnection);
+ }
+}
+void DecodeSignal::disconnect_input_notifiers()
+{
+ // Disconnect the notification slot from the previous set of signals
+ for (decode::DecodeChannel& ch : channels_) {
+ if (!ch.assigned_signal)
+ continue;
const data::SignalBase *signal = ch.assigned_signal.get();
- connect(signal, &data::SignalBase::samples_cleared,
- this, &DecodeSignal::on_data_cleared);
- connect(signal, &data::SignalBase::samples_added,
- this, &DecodeSignal::on_data_received);
+ disconnect(signal, nullptr, this, SLOT(on_data_cleared()));
+ disconnect(signal, nullptr, this, SLOT(on_data_received()));
+
+ if (signal->logic_data())
+ disconnect(signal->logic_data().get(), nullptr, this, SLOT(on_input_segment_completed()));
}
}
ds->new_binary_data(ds->current_segment_id_, (void*)dec, pdb->bin_class);
}
+void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_signal)
+{
+ assert(pdata);
+ assert(decode_signal);
+
+ DecodeSignal *const ds = (DecodeSignal*)decode_signal;
+ assert(ds);
+
+ if (ds->decode_interrupt_)
+ return;
+
+ lock_guard<mutex> lock(ds->output_mutex_);
+
+ assert(pdata->pdo);
+ assert(pdata->pdo->di);
+ const srd_decoder *const decc = pdata->pdo->di->decoder;
+ assert(decc);
+
+ const srd_proto_data_logic *const pdl = (const srd_proto_data_logic*)pdata->data;
+ assert(pdl);
+
+ shared_ptr<Logic> output_logic = ds->output_logic_.at(decc);
+ shared_ptr<LogicSegment> last_segment =
+ dynamic_pointer_cast<LogicSegment>(output_logic->segments().back());
+ assert(last_segment);
+
+ last_segment->append_subsignal_payload(pdl->logic_class, (void*)pdl->data, pdl->size);
+
+ qInfo() << "Received" << pdl->size << "bytes /" << pdl->size \
+ << "samples of logic output for class" << pdl->logic_class << "from decoder" \
+ << QString::fromUtf8(decc->name);
+}
+
void DecodeSignal::on_capture_state_changed(int state)
{
// If a new acquisition was started, we need to start decoding from scratch
void DecodeSignal::on_data_received()
{
// If we detected a lack of input data when trying to start decoding,
- // we have set an error message. Only try again if we now have data
+ // we have set an error message. Bail out if we still don't have data
// to work with
if ((!error_message_.isEmpty()) && (get_input_segment_count() == 0))
return;
+ if (!error_message_.isEmpty()) {
+ error_message_.clear();
+ // TODO Emulate noquote()
+ qDebug().nospace() << name() << ": Input data available, error cleared";
+ }
+
if (!logic_mux_thread_.joinable())
begin_decode();
else
logic_mux_cond_.notify_one();
}
+void DecodeSignal::on_input_segment_completed()
+{
+ if (!logic_mux_thread_.joinable())
+ logic_mux_cond_.notify_one();
+}
+
void DecodeSignal::on_annotation_visibility_changed()
{
annotation_visibility_changed();
projects / pulseview.git / blobdiff