srd_session_(nullptr),
logic_mux_data_invalid_(false),
stack_config_changed_(true),
- current_segment_id_(0),
- error_message_("")
+ current_segment_id_(0)
{
connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(on_capture_state_changed(int)));
logic_mux_data_invalid_ = true;
if (!error_message_.isEmpty()) {
- error_message_ = QString();
+ error_message_.clear();
// TODO Emulate noquote()
qDebug().nospace() << name() << ": Error cleared";
}
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)
-{
- error_message_ = msg;
- // TODO Emulate noquote()
- qDebug().nospace() << name() << ": " << msg;
-}
-
bool DecodeSignal::all_input_segments_complete(uint32_t segment_id) const
{
bool all_complete = true;
if (segment_id >= logic_data->logic_segments().size())
return false;
- const shared_ptr<LogicSegment> segment = logic_data->logic_segments()[segment_id];
- if (!segment->is_complete())
+ const shared_ptr<const LogicSegment> segment = logic_data->logic_segments()[segment_id]->get_shared_ptr();
+ if (segment && !segment->is_complete())
all_complete = false;
}
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;
}
// 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));
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;
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();
terminate_srd_session();
} else {
// All segments have been processed
- decode_finished();
+ if (!decode_interrupt_)
+ decode_finished();
}
} else {
// Wait for more input data
}
}
} 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()
if (!ch.assigned_signal)
continue;
- const data::SignalBase *signal = ch.assigned_signal;
+ 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,