logic_mux_data_invalid_ = true;
if (!error_message_.isEmpty()) {
- error_message_ = QString();
+ error_message_.clear();
// TODO Emulate noquote()
qDebug().nospace() << name() << ": Error cleared";
}
// Receive notifications when new sample data is available
connect_input_notifiers();
- if (get_input_segment_count() == 0) {
+ if (get_input_segment_count() == 0)
set_error_message(tr("No input data"));
- return;
- }
// Make sure the logic output data is complete and up-to-date
logic_mux_interrupt_ = false;
return decode_paused_;
}
-QString DecodeSignal::error_message() const
-{
- lock_guard<mutex> lock(output_mutex_);
- return error_message_;
-}
-
const vector<decode::DecodeChannel> DecodeSignal::get_channels() const
{
return channels_;
}
if (match) {
- ch.assigned_signal = match.get();
+ ch.assigned_signal = match;
new_assignment = true;
}
}
}
}
-void DecodeSignal::assign_signal(const uint16_t channel_id, const SignalBase *signal)
+void DecodeSignal::assign_signal(const uint16_t channel_id, shared_ptr<const SignalBase> signal)
{
for (decode::DecodeChannel& ch : channels_)
if (ch.id == channel_id) {
{
// Count all channels that have a signal assigned to them
return count_if(channels_.begin(), channels_.end(),
- [](decode::DecodeChannel ch) { return ch.assigned_signal; });
+ [](decode::DecodeChannel ch) { return ch.assigned_signal.get(); });
}
void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int init_state)
if (segment_id >= logic_data->logic_segments().size())
return 0;
- const shared_ptr<LogicSegment> segment = logic_data->logic_segments()[segment_id];
- count = min(count, (int64_t)segment->get_sample_count());
+ const shared_ptr<const LogicSegment> segment = logic_data->logic_segments()[segment_id]->get_shared_ptr();
+ if (segment)
+ count = min(count, (int64_t)segment->get_sample_count());
}
return (no_signals_assigned ? 0 : count);
for (const shared_ptr<data::SignalBase>& signal : signalbases)
if ((signal->name() == assigned_signal_name) && (signal->type() != SignalBase::DecodeChannel))
- channel->assigned_signal = signal.get();
+ channel->assigned_signal = signal;
channel->initial_pin_state = settings.value("initial_pin_state").toInt();
begin_decode();
}
-void DecodeSignal::set_error_message(QString msg)
+bool DecodeSignal::all_input_segments_complete(uint32_t segment_id) const
{
- error_message_ = msg;
- // TODO Emulate noquote()
- qDebug().nospace() << name() << ": " << msg;
+ bool all_complete = true;
+
+ for (const decode::DecodeChannel& ch : channels_)
+ if (ch.assigned_signal) {
+ if (!ch.assigned_signal->logic_data())
+ continue;
+
+ const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
+ if (logic_data->logic_segments().empty())
+ return false;
+
+ if (segment_id >= logic_data->logic_segments().size())
+ return false;
+
+ const shared_ptr<const LogicSegment> segment = logic_data->logic_segments()[segment_id]->get_shared_ptr();
+ if (segment && !segment->is_complete())
+ all_complete = false;
+ }
+
+ return all_complete;
}
uint32_t DecodeSignal::get_input_segment_count() const
return (no_signals_assigned ? 0 : count);
}
-uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const
+double DecodeSignal::get_input_samplerate(uint32_t segment_id) const
{
double samplerate = 0;
continue;
try {
- const shared_ptr<LogicSegment> segment = logic_data->logic_segments().at(segment_id);
- samplerate = segment->samplerate();
+ const shared_ptr<const LogicSegment> segment =
+ logic_data->logic_segments().at(segment_id)->get_shared_ptr();
+ if (segment)
+ samplerate = segment->samplerate();
} catch (out_of_range&) {
// Do nothing
}
return;
// Fetch the channel segments and their data
- vector<shared_ptr<LogicSegment> > segments;
+ vector<shared_ptr<const LogicSegment> > segments;
vector<const uint8_t*> signal_data;
vector<uint8_t> signal_in_bytepos;
vector<uint8_t> signal_in_bitpos;
if (ch.assigned_signal) {
const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
- shared_ptr<LogicSegment> segment;
- try {
- segment = logic_data->logic_segments().at(segment_id);
- } catch (out_of_range&) {
+ shared_ptr<const LogicSegment> segment;
+ if (segment_id < logic_data->logic_segments().size()) {
+ segment = logic_data->logic_segments().at(segment_id)->get_shared_ptr();
+ } else {
qDebug() << "Muxer error for" << name() << ":" << ch.assigned_signal->name() \
<< "has no logic segment" << segment_id;
+ logic_mux_interrupt_ = true;
return;
}
+
+ if (!segment)
+ return;
+
segments.push_back(segment);
uint8_t* data = new uint8_t[(end - start) * segment->unit_size()];
signal_in_bitpos.push_back(bitpos % 8);
}
-
shared_ptr<LogicSegment> output_segment;
try {
output_segment = logic_mux_data_->logic_segments().at(segment_id);
qDebug() << "Muxer error for" << name() << ": no logic mux segment" \
<< segment_id << "in mux_logic_samples(), mux segments size is" \
<< logic_mux_data_->logic_segments().size();
+ logic_mux_interrupt_ = true;
return;
}
void DecodeSignal::logic_mux_proc()
{
- uint32_t segment_id = 0;
+ uint32_t input_segment_count;
+ do {
+ input_segment_count = get_input_segment_count();
+ if (input_segment_count == 0) {
+ // Wait for input data
+ unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
+ logic_mux_cond_.wait(logic_mux_lock);
+ }
+ } while ((!logic_mux_interrupt_) && (input_segment_count == 0));
+
+ if (logic_mux_interrupt_)
+ return;
assert(logic_mux_data_);
+ uint32_t segment_id = 0;
+
// Create initial logic mux segment
shared_ptr<LogicSegment> output_segment =
- make_shared<LogicSegment>(*logic_mux_data_, segment_id,
- logic_mux_unit_size_, 0);
+ make_shared<LogicSegment>(*logic_mux_data_, segment_id, logic_mux_unit_size_, 0);
logic_mux_data_->push_segment(output_segment);
output_segment->set_samplerate(get_input_samplerate(0));
+ // Logic mux data is being updated
+ logic_mux_data_invalid_ = false;
+
+ uint64_t samples_to_process;
do {
- const uint64_t input_sample_count = get_working_sample_count(segment_id);
- const uint64_t output_sample_count = output_segment->get_sample_count();
+ do {
+ const uint64_t input_sample_count = get_working_sample_count(segment_id);
+ const uint64_t output_sample_count = output_segment->get_sample_count();
- const uint64_t samples_to_process =
- (input_sample_count > output_sample_count) ?
- (input_sample_count - output_sample_count) : 0;
+ samples_to_process =
+ (input_sample_count > output_sample_count) ?
+ (input_sample_count - output_sample_count) : 0;
- // Process the samples if necessary...
- if (samples_to_process > 0) {
- const uint64_t unit_size = output_segment->unit_size();
- const uint64_t chunk_sample_count = DecodeChunkLength / unit_size;
+ if (samples_to_process > 0) {
+ const uint64_t unit_size = output_segment->unit_size();
+ const uint64_t chunk_sample_count = DecodeChunkLength / unit_size;
- uint64_t processed_samples = 0;
- do {
- const uint64_t start_sample = output_sample_count + processed_samples;
- const uint64_t sample_count =
- min(samples_to_process - processed_samples, chunk_sample_count);
+ uint64_t processed_samples = 0;
+ do {
+ const uint64_t start_sample = output_sample_count + processed_samples;
+ const uint64_t sample_count =
+ min(samples_to_process - processed_samples, chunk_sample_count);
- mux_logic_samples(segment_id, start_sample, start_sample + sample_count);
- processed_samples += sample_count;
+ mux_logic_samples(segment_id, start_sample, start_sample + sample_count);
+ processed_samples += sample_count;
- // ...and process the newly muxed logic data
- decode_input_cond_.notify_one();
- } while (!logic_mux_interrupt_ && (processed_samples < samples_to_process));
- }
+ // ...and process the newly muxed logic data
+ decode_input_cond_.notify_one();
+ } while (!logic_mux_interrupt_ && (processed_samples < samples_to_process));
+ }
+ } while (!logic_mux_interrupt_ && (samples_to_process > 0));
- if (samples_to_process == 0) {
- // TODO Optimize this by caching the input segment count and only
- // querying it when the cached value was reached
- if (segment_id < get_input_segment_count() - 1) {
- // Process next segment
- segment_id++;
+ if (!logic_mux_interrupt_) {
+ // samples_to_process is now 0, we've exhausted the currently available input data
- output_segment =
- make_shared<LogicSegment>(*logic_mux_data_, segment_id,
- logic_mux_unit_size_, 0);
- logic_mux_data_->push_segment(output_segment);
+ // If the input segments are complete, we've completed this segment
+ if (all_input_segments_complete(segment_id)) {
+ if (!output_segment->is_complete())
+ output_segment->set_complete();
- output_segment->set_samplerate(get_input_samplerate(segment_id));
+ if (segment_id < get_input_segment_count() - 1) {
+ // Process next segment
+ segment_id++;
- } else {
- // All segments have been processed
- logic_mux_data_invalid_ = false;
+ output_segment =
+ make_shared<LogicSegment>(*logic_mux_data_, segment_id,
+ logic_mux_unit_size_, 0);
+ logic_mux_data_->push_segment(output_segment);
- // Wait for more input
+ output_segment->set_samplerate(get_input_samplerate(segment_id));
+ }
+ }
+
+ if (segment_id == (get_input_segment_count() - 1)) {
+ // 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);
}
}
-
} while (!logic_mux_interrupt_);
}
void DecodeSignal::decode_data(
const int64_t abs_start_samplenum, const int64_t sample_count,
- const shared_ptr<LogicSegment> input_segment)
+ const shared_ptr<const LogicSegment> input_segment)
{
const int64_t unit_size = input_segment->unit_size();
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,
input_segment->get_samples(i, chunk_end, chunk);
if (srd_session_send(srd_session_, i, chunk_end, chunk,
- data_size, unit_size) != SRD_OK)
+ data_size, unit_size) != SRD_OK) {
set_error_message(tr("Decoder reported an error"));
+ decode_interrupt_ = true;
+ }
delete[] chunk;
current_segment_id_ = 0;
// If there is no input data available yet, wait until it is or we're interrupted
- if (logic_mux_data_->logic_segments().size() == 0) {
- unique_lock<mutex> input_wait_lock(input_mutex_);
- decode_input_cond_.wait(input_wait_lock);
- }
+ do {
+ if (logic_mux_data_->logic_segments().size() == 0) {
+ // Wait for input data
+ unique_lock<mutex> input_wait_lock(input_mutex_);
+ decode_input_cond_.wait(input_wait_lock);
+ }
+ } while ((!decode_interrupt_) && (logic_mux_data_->logic_segments().size() == 0));
if (decode_interrupt_)
return;
- shared_ptr<LogicSegment> input_segment = logic_mux_data_->logic_segments().front();
- assert(input_segment);
+ shared_ptr<const LogicSegment> input_segment = logic_mux_data_->logic_segments().front()->get_shared_ptr();
+ if (!input_segment)
+ return;
// Create the initial segment and set its sample rate so that we can pass it to SRD
create_decode_segment();
start_srd_session();
- uint64_t sample_count = 0;
+ uint64_t samples_to_process = 0;
uint64_t abs_start_samplenum = 0;
do {
// Keep processing new samples until we exhaust the input data
do {
- lock_guard<mutex> input_lock(input_mutex_);
- sample_count = input_segment->get_sample_count() - abs_start_samplenum;
+ samples_to_process = input_segment->get_sample_count() - abs_start_samplenum;
- if (sample_count > 0) {
- decode_data(abs_start_samplenum, sample_count, input_segment);
- abs_start_samplenum += sample_count;
+ if (samples_to_process > 0) {
+ decode_data(abs_start_samplenum, samples_to_process, input_segment);
+ abs_start_samplenum += samples_to_process;
}
- } while (error_message_.isEmpty() && (sample_count > 0) && !decode_interrupt_);
-
- if (error_message_.isEmpty() && !decode_interrupt_ && sample_count == 0) {
- if (current_segment_id_ < logic_mux_data_->logic_segments().size() - 1) {
- // Process next segment
- current_segment_id_++;
-
- try {
- input_segment = logic_mux_data_->logic_segments().at(current_segment_id_);
- } catch (out_of_range&) {
- qDebug() << "Decode error for" << name() << ": no logic mux segment" \
- << current_segment_id_ << "in decode_proc(), mux segments size is" \
- << logic_mux_data_->logic_segments().size();
- return;
+ } while (!decode_interrupt_ && (samples_to_process > 0));
+
+ if (!decode_interrupt_) {
+ // samples_to_process is now 0, we've exhausted the currently available input data
+
+ // 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)) {
+ // Process next segment
+ current_segment_id_++;
+
+ try {
+ input_segment = logic_mux_data_->logic_segments().at(current_segment_id_);
+ } catch (out_of_range&) {
+ qDebug() << "Decode error for" << name() << ": no logic mux segment" \
+ << current_segment_id_ << "in decode_proc(), mux segments size is" \
+ << logic_mux_data_->logic_segments().size();
+ decode_interrupt_ = true;
+ return;
+ }
+ abs_start_samplenum = 0;
+
+ // Create the next segment and set its metadata
+ create_decode_segment();
+ segments_.at(current_segment_id_).samplerate = input_segment->samplerate();
+ segments_.at(current_segment_id_).start_time = input_segment->start_time();
+
+ // Reset decoder state but keep the decoder stack intact
+ terminate_srd_session();
+ } else {
+ // All segments have been processed
+ if (!decode_interrupt_)
+ decode_finished();
}
- abs_start_samplenum = 0;
-
- // Create the next segment and set its metadata
- create_decode_segment();
- segments_.at(current_segment_id_).samplerate = input_segment->samplerate();
- segments_.at(current_segment_id_).start_time = input_segment->start_time();
-
- // Reset decoder state but keep the decoder stack intact
- terminate_srd_session();
- } else {
- // All segments have been processed
- decode_finished();
+ }
- // Wait for new input data or an interrupt was requested
+ if (current_segment_id_ == (logic_mux_data_->logic_segments().size() - 1)) {
+ // Wait for more input data if we're processing the currently last segment
unique_lock<mutex> input_wait_lock(input_mutex_);
decode_input_cond_.wait(input_wait_lock);
}
}
- } while (error_message_.isEmpty() && !decode_interrupt_);
-
- // Potentially reap decoders when the application no longer is
- // interested in their (pending) results.
- if (decode_interrupt_)
- terminate_srd_session();
+ } while (!decode_interrupt_);
}
void DecodeSignal::start_srd_session()
if (!ch.assigned_signal)
continue;
- const data::SignalBase *signal = ch.assigned_signal;
- connect(signal, SIGNAL(samples_cleared()),
- this, SLOT(on_data_cleared()));
- connect(signal, SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
- this, SLOT(on_data_received()));
+ 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);
}
}
// to work with
if ((!error_message_.isEmpty()) && (get_input_segment_count() == 0))
return;
+ else {
+ error_message_.clear();
+ // TODO Emulate noquote()
+ qDebug().nospace() << name() << ": Error cleared";
+ }
if (!logic_mux_thread_.joinable())
begin_decode();