session_(session),
srd_session_(nullptr),
logic_mux_data_invalid_(false),
+ stack_config_changed_(true),
current_segment_id_(0)
{
connect(&session_, SIGNAL(capture_state_changed(int)),
DecodeSignal::~DecodeSignal()
{
- reset_decode();
+ reset_decode(true);
}
const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
// Include the newly created decode channels in the channel lists
update_channel_list();
+ stack_config_changed_ = true;
auto_assign_signals(dec);
commit_decoder_channels();
begin_decode();
stack_.erase(iter);
// Update channels and decoded data
+ stack_config_changed_ = true;
update_channel_list();
begin_decode();
}
return state;
}
-void DecodeSignal::reset_decode()
+void DecodeSignal::reset_decode(bool shutting_down)
{
- terminate_srd_session();
+ if (stack_config_changed_ || shutting_down)
+ stop_srd_session();
+ else
+ terminate_srd_session();
if (decode_thread_.joinable()) {
decode_interrupt_ = true;
logic_mux_thread_.join();
}
- stop_srd_session();
-
class_rows_.clear();
current_segment_id_ = 0;
segments_.clear();
logic_mux_data_.reset();
logic_mux_data_invalid_ = true;
- error_message_ = QString();
+ if (!error_message_.isEmpty()) {
+ error_message_ = QString();
+ qDebug().noquote().nospace() << name() << ": Error cleared";
+ }
decode_reset();
}
void DecodeSignal::begin_decode()
{
- terminate_srd_session();
-
if (decode_thread_.joinable()) {
decode_interrupt_ = true;
decode_input_cond_.notify_one();
reset_decode();
if (stack_.size() == 0) {
- error_message_ = tr("No decoders");
+ set_error_message(tr("No decoders"));
return;
}
assert(channels_.size() > 0);
if (get_assigned_signal_count() == 0) {
- error_message_ = tr("There are no channels assigned to this decoder");
+ set_error_message(tr("There are no channels assigned to this decoder"));
return;
}
// Check that all decoders have the required channels
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (!dec->have_required_channels()) {
- error_message_ = tr("One or more required channels "
- "have not been specified");
+ set_error_message(tr("One or more required channels "
+ "have not been specified"));
return;
}
connect_input_notifiers();
if (get_input_segment_count() == 0) {
- error_message_ = tr("No input data");
+ set_error_message(tr("No input data"));
return;
}
if (new_assignment) {
logic_mux_data_invalid_ = true;
+ stack_config_changed_ = true;
commit_decoder_channels();
channels_updated();
}
logic_mux_data_invalid_ = true;
}
+ stack_config_changed_ = true;
commit_decoder_channels();
channels_updated();
begin_decode();
if (ch.id == channel_id)
ch.initial_pin_state = init_state;
+ stack_config_changed_ = true;
channels_updated();
-
begin_decode();
}
}
// Update the internal structures
+ stack_config_changed_ = true;
update_channel_list();
commit_decoder_channels();
begin_decode();
}
+void DecodeSignal::set_error_message(QString msg)
+{
+ error_message_ = msg;
+ qDebug().noquote().nospace() << name() << ": " << msg;
+}
+
uint32_t DecodeSignal::get_input_segment_count() const
{
uint64_t count = std::numeric_limits<uint64_t>::max();
if (srd_session_send(srd_session_, i, chunk_end, chunk,
data_size, unit_size) != SRD_OK) {
- error_message_ = tr("Decoder reported an error");
+ set_error_message(tr("Decoder reported an error"));
delete[] chunk;
break;
}
{
uint64_t samplerate;
+ // If there were stack changes, the session has been destroyed by now, so if
+ // it hasn't been destroyed, we can just reset and re-use it
if (srd_session_) {
// When a decoder stack was created before, re-use it
// for the next stream of input data, after terminating
srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_);
if (!di) {
- error_message_ = tr("Failed to create decoder instance");
+ set_error_message(tr("Failed to create decoder instance"));
srd_session_destroy(srd_session_);
srd_session_ = nullptr;
return;
DecodeSignal::annotation_callback, this);
srd_session_start(srd_session_);
+
+ // We just recreated the srd session, so all stack changes are applied now
+ stack_config_changed_ = false;
}
void DecodeSignal::terminate_srd_session()
// Destroy the session
srd_session_destroy(srd_session_);
srd_session_ = nullptr;
+
+ // Mark the decoder instances as non-existant since they were deleted
+ for (const shared_ptr<decode::Decoder> &dec : stack_)
+ dec->invalidate_decoder_inst();
}
}