session_(session),
srd_session_(nullptr),
logic_mux_data_invalid_(false),
- current_segment_id_(0),
- current_segment_(nullptr)
+ stack_config_changed_(true),
+ current_segment_id_(0)
{
connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(on_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)
{
+ if (stack_config_changed_ || shutting_down)
+ stop_srd_session();
+ else
+ terminate_srd_session();
+
if (decode_thread_.joinable()) {
decode_interrupt_ = true;
decode_input_cond_.notify_one();
logic_mux_thread_.join();
}
- stop_srd_session();
-
class_rows_.clear();
- currently_processed_segment_ = 0;
- current_segment_ = nullptr;
+ 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();
+ // TODO Emulate noquote()
+ qDebug().nospace() << name() << ": Error cleared";
+ }
decode_reset();
}
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;
}
// Receive notifications when new sample data is available
connect_input_notifiers();
- const uint32_t segment_count = get_input_segment_count();
-
- if (segment_count == 0) {
- error_message_ = tr("No input data");
+ if (get_input_segment_count() == 0) {
+ set_error_message(tr("No input data"));
return;
}
- for (uint32_t i = 0; i < segment_count; i++)
- create_new_segment();
-
// Make sure the logic output data is complete and up-to-date
logic_mux_interrupt_ = false;
logic_mux_thread_ = std::thread(&DecodeSignal::logic_mux_proc, this);
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();
}
double result = 0;
// TODO For now, we simply return the first samplerate that we have
- try {
- const DecodeSegment *segment = &(segments_.at(0));
- result = segment->samplerate;
- } catch (out_of_range) {
- // Do nothing
- }
+ if (segments_.size() > 0)
+ result = segments_.front().samplerate;
return result;
}
pv::util::Timestamp result;
// TODO For now, we simply return the first start time that we have
- try {
- const DecodeSegment *segment = &(segments_.at(0));
- result = segment->start_time;
- } catch (out_of_range) {
- // Do nothing
- }
+ if (segments_.size() > 0)
+ result = segments_.front().start_time;
return result;
}
-uint32_t DecodeSignal::get_input_segment_count() const
-{
- uint64_t count = std::numeric_limits<uint64_t>::max();
- bool no_signals_assigned = true;
-
- for (const data::DecodeChannel &ch : channels_)
- if (ch.assigned_signal) {
- no_signals_assigned = false;
-
- const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
- if (!logic_data || logic_data->logic_segments().empty())
- return 0;
-
- // Find the min value of all segment counts
- if ((uint64_t)(logic_data->logic_segments().size()) < count)
- count = logic_data->logic_segments().size();
- }
-
- return (no_signals_assigned ? 0 : count);
-}
-
int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const
{
// The working sample count is the highest sample number for
try {
const shared_ptr<LogicSegment> segment = logic_data->logic_segments().at(segment_id);
count = min(count, (int64_t)segment->get_sample_count());
- } catch (out_of_range) {
+ } catch (out_of_range&) {
return 0;
}
}
try {
const DecodeSegment *segment = &(segments_.at(segment_id));
result = segment->samples_decoded;
- } catch (out_of_range) {
+ } catch (out_of_range&) {
// Do nothing
}
if (iter != rows->end())
(*iter).second.get_annotation_subset(dest,
start_sample, end_sample);
- } catch (out_of_range) {
+ } catch (out_of_range&) {
// Do nothing
}
}
}
// 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;
+ // TODO Emulate noquote()
+ qDebug().nospace() << name() << ": " << msg;
+}
+
+uint32_t DecodeSignal::get_input_segment_count() const
+{
+ uint64_t count = std::numeric_limits<uint64_t>::max();
+ bool no_signals_assigned = true;
+
+ for (const data::DecodeChannel &ch : channels_)
+ if (ch.assigned_signal) {
+ no_signals_assigned = false;
+
+ const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
+ if (!logic_data || logic_data->logic_segments().empty())
+ return 0;
+
+ // Find the min value of all segment counts
+ if ((uint64_t)(logic_data->logic_segments().size()) < count)
+ count = logic_data->logic_segments().size();
+ }
+
+ return (no_signals_assigned ? 0 : count);
+}
+
+uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const
+{
+ double samplerate = 0;
+
+ for (const data::DecodeChannel &ch : channels_)
+ if (ch.assigned_signal) {
+ const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
+ if (!logic_data || logic_data->logic_segments().empty())
+ continue;
+
+ try {
+ const shared_ptr<LogicSegment> segment = logic_data->logic_segments().at(segment_id);
+ samplerate = segment->samplerate();
+ } catch (out_of_range&) {
+ // Do nothing
+ }
+ break;
+ }
+
+ return samplerate;
+}
+
void DecodeSignal::update_channel_list()
{
vector<data::DecodeChannel> prev_channels = channels_;
shared_ptr<LogicSegment> segment;
try {
segment = logic_data->logic_segments().at(segment_id);
- } catch (out_of_range) {
+ } catch (out_of_range&) {
qDebug() << "Muxer error for" << name() << ":" << ch.assigned_signal->name() \
<< "has no logic segment" << segment_id;
return;
shared_ptr<LogicSegment> output_segment;
try {
output_segment = logic_mux_data_->logic_segments().at(segment_id);
- } catch (out_of_range) {
+ } catch (out_of_range&) {
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();
}
// Perform the muxing of signal data into the output data
- uint8_t* output = new uint8_t[(end - start) * logic_mux_segment_->unit_size()];
+ uint8_t* output = new uint8_t[(end - start) * output_segment->unit_size()];
unsigned int signal_count = signal_data.size();
- for (int64_t sample_cnt = 0; sample_cnt < (end - start); sample_cnt++) {
+ for (int64_t sample_cnt = 0; !logic_mux_interrupt_ && (sample_cnt < (end - start));
+ sample_cnt++) {
+
int bitpos = 0;
uint8_t bytepos = 0;
- const int out_sample_pos = sample_cnt * logic_mux_segment_->unit_size();
- for (unsigned int i = 0; i < logic_mux_segment_->unit_size(); i++)
+ const int out_sample_pos = sample_cnt * output_segment->unit_size();
+ for (unsigned int i = 0; i < output_segment->unit_size(); i++)
output[out_sample_pos + i] = 0;
for (unsigned int i = 0; i < signal_count; i++) {
}
}
- logic_mux_segment_->append_payload(output, (end - start) * logic_mux_segment_->unit_size());
+ output_segment->append_payload(output, (end - start) * output_segment->unit_size());
delete[] output;
for (const uint8_t* data : signal_data)
{
uint32_t segment_id = 0;
- try {
- logic_mux_segment_ = logic_mux_data_->logic_segments().front();
- } catch (out_of_range) {
- qDebug() << "Muxer error for" << name() << ": no logic mux segments";
- return;
- }
+ assert(logic_mux_data_);
+
+ // Create initial logic mux segment
+ shared_ptr<LogicSegment> output_segment =
+ 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));
do {
const uint64_t input_sample_count = get_working_sample_count(segment_id);
- const uint64_t output_sample_count = logic_mux_segment_->get_sample_count();
+ const uint64_t output_sample_count = output_segment->get_sample_count();
const uint64_t samples_to_process =
(input_sample_count > output_sample_count) ?
// Process the samples if necessary...
if (samples_to_process > 0) {
- const uint64_t unit_size = logic_mux_segment_->unit_size();
+ const uint64_t unit_size = output_segment->unit_size();
const uint64_t chunk_sample_count = DecodeChunkLength / unit_size;
uint64_t processed_samples = 0;
// ...and process the newly muxed logic data
decode_input_cond_.notify_one();
- } while (processed_samples < samples_to_process);
+ } while (!logic_mux_interrupt_ && (processed_samples < samples_to_process));
}
if (samples_to_process == 0) {
// Process next segment
segment_id++;
- try {
- logic_mux_segment_ = logic_mux_data_->logic_segments().at(segment_id);
- } catch (out_of_range) {
- qDebug() << "Muxer error for" << name() << ": no logic mux segment" \
- << segment_id << "in logic_mux_proc(), mux segments size is" \
- << logic_mux_data_->logic_segments().size();
- return;
- }
+ output_segment =
+ 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(segment_id));
} else {
// All segments have been processed
} while (!logic_mux_interrupt_);
}
-void DecodeSignal::query_input_metadata()
-{
- // Update the samplerate and start time because we cannot start
- // the libsrd session without the current samplerate
-
- // TODO Currently we assume all channels have the same sample rate
- // and start time
- bool samplerate_valid = false;
- data::DecodeChannel *any_channel;
- shared_ptr<Logic> logic_data;
-
- assert(current_segment_);
-
- do {
- any_channel = &(*find_if(channels_.begin(), channels_.end(),
- [](data::DecodeChannel ch) { return ch.assigned_signal; }));
-
- logic_data = any_channel->assigned_signal->logic_data();
-
- if (!logic_data) {
- // Wait until input data is available or an interrupt was requested
- unique_lock<mutex> input_wait_lock(input_mutex_);
- decode_input_cond_.wait(input_wait_lock);
- }
- } while (!logic_data && !decode_interrupt_);
-
- if (decode_interrupt_)
- return;
-
- do {
- if (!logic_data->logic_segments().empty()) {
- shared_ptr<LogicSegment> first_segment =
- any_channel->assigned_signal->logic_data()->logic_segments().front();
-
- current_segment_->start_time = first_segment->start_time();
- current_segment_->samplerate = first_segment->samplerate();
- if (current_segment_->samplerate > 0)
- samplerate_valid = true;
- }
-
- if (!samplerate_valid) {
- // Wait until input data is available or an interrupt was requested
- unique_lock<mutex> input_wait_lock(input_mutex_);
- decode_input_cond_.wait(input_wait_lock);
- }
- } while (!samplerate_valid && !decode_interrupt_);
-}
-
void DecodeSignal::decode_data(
- const int64_t abs_start_samplenum, const int64_t sample_count)
+ const int64_t abs_start_samplenum, const int64_t sample_count,
+ const shared_ptr<LogicSegment> input_segment)
{
- assert(current_segment_);
-
- const int64_t unit_size = logic_mux_segment_->unit_size();
+ 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;
const int64_t chunk_end = min(i + chunk_sample_count,
abs_start_samplenum + sample_count);
+ // Report this chunk as already decoded so that annotations don't
+ // appear in an area that we claim to not having been been decoded yet
+ {
+ lock_guard<mutex> lock(output_mutex_);
+ segments_.at(current_segment_id_).samples_decoded = chunk_end;
+ }
+
int64_t data_size = (chunk_end - i) * unit_size;
uint8_t* chunk = new uint8_t[data_size];
- logic_mux_segment_->get_samples(i, chunk_end, chunk);
+ input_segment->get_samples(i, chunk_end, chunk);
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;
}
delete[] chunk;
- {
- lock_guard<mutex> lock(output_mutex_);
- current_segment_->samples_decoded = chunk_end;
- }
-
// Notify the frontend that we processed some data and
// possibly have new annotations as well
new_annotations();
void DecodeSignal::decode_proc()
{
- query_input_metadata();
+ 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);
+ }
if (decode_interrupt_)
return;
+ shared_ptr<LogicSegment> input_segment = logic_mux_data_->logic_segments().front();
+ assert(input_segment);
+
+ // Create the initial segment and set its sample rate so that we can pass it to SRD
+ create_decode_segment();
+ segments_.at(current_segment_id_).samplerate = input_segment->samplerate();
+ segments_.at(current_segment_id_).start_time = input_segment->start_time();
+
start_srd_session();
- uint64_t sample_count;
+ uint64_t sample_count = 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 = logic_mux_segment_->get_sample_count() - abs_start_samplenum;
+ sample_count = input_segment->get_sample_count() - abs_start_samplenum;
if (sample_count > 0) {
- decode_data(abs_start_samplenum, sample_count);
+ decode_data(abs_start_samplenum, sample_count, input_segment);
abs_start_samplenum += sample_count;
}
} while (error_message_.isEmpty() && (sample_count > 0) && !decode_interrupt_);
- if (error_message_.isEmpty() && !decode_interrupt_) {
- if (sample_count == 0)
+ 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;
+ }
+ 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
- unique_lock<mutex> input_wait_lock(input_mutex_);
- decode_input_cond_.wait(input_wait_lock);
+ // Wait for new input data or an interrupt was requested
+ 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();
}
void DecodeSignal::start_srd_session()
{
- if (srd_session_)
- stop_srd_session();
+ uint64_t samplerate;
- assert(current_segment_);
+ // 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
+ // potentially still executing operations, and resetting
+ // internal state. Skip the rather expensive (teardown
+ // and) construction of another decoder stack.
+
+ // TODO Reduce redundancy, use a common code path for
+ // the meta/cb/start sequence?
+ terminate_srd_session();
+ srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
+ g_variant_new_uint64(segments_.at(current_segment_id_).samplerate));
+ srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN,
+ DecodeSignal::annotation_callback, this);
+ srd_session_start(srd_session_);
+ return;
+ }
// Create the session
srd_session_new(&srd_session_);
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;
}
}
// Start the session
- srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
- g_variant_new_uint64(current_segment_->samplerate));
+ samplerate = segments_.at(current_segment_id_).samplerate;
+ if (samplerate)
+ srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
+ g_variant_new_uint64(samplerate));
srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN,
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()
+{
+ // Call the "terminate and reset" routine for the decoder stack
+ // (if available). This does not harm those stacks which already
+ // have completed their operation, and reduces response time for
+ // those stacks which still are processing data while the
+ // application no longer wants them to.
+ if (srd_session_)
+ srd_session_terminate_reset(srd_session_);
}
void DecodeSignal::stop_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();
}
}
const data::SignalBase *signal = ch.assigned_signal;
connect(signal, SIGNAL(samples_cleared()),
this, SLOT(on_data_cleared()));
- connect(signal, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+ connect(signal, SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
this, SLOT(on_data_received()));
}
}
-void DecodeSignal::create_new_segment()
+void DecodeSignal::create_decode_segment()
{
- // Create logic mux segment if we're recreating the muxed data
- if (logic_mux_data_invalid_) {
- const double samplerate =
- (current_segment_) ? current_segment_->samplerate : 0;
-
- logic_mux_segment_ = make_shared<LogicSegment>(*logic_mux_data_,
- logic_mux_unit_size_, samplerate);
- logic_mux_data_->push_segment(logic_mux_segment_);
- }
-
// Create annotation segment
segments_.emplace_back(DecodeSegment());
- current_segment_ = &(segments_.back());
-
- // TODO Currently we assume there's only one sample rate
- current_segment_->samplerate = segments_.front().samplerate;
// Add annotation classes
for (const shared_ptr<decode::Decoder> &dec : stack_) {
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
- (current_segment_->annotation_rows)[Row(decc)] = decode::RowData();
+ (segments_.back().annotation_rows)[Row(decc)] =
+ decode::RowData();
// Add the decoder rows
for (const GSList *l = decc->annotation_rows; l; l = l->next) {
const Row row(decc, ann_row);
// Add a new empty row data object
- (current_segment_->annotation_rows)[row] = decode::RowData();
+ (segments_.back().annotation_rows)[row] =
+ decode::RowData();
}
}
}
DecodeSignal *const ds = (DecodeSignal*)decode_signal;
assert(ds);
+ if (ds->decode_interrupt_)
+ return;
+
lock_guard<mutex> lock(ds->output_mutex_);
// Find the row
assert(pdata->pdo->di);
const srd_decoder *const decc = pdata->pdo->di->decoder;
assert(decc);
- assert(ds->current_segment_);
const srd_proto_data_annotation *const pda =
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
- auto row_iter = ds->current_segment_->annotation_rows.end();
+ auto row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.end();
// Try looking up the sub-row of this class
const auto format = pda->ann_class;
const auto r = ds->class_rows_.find(make_pair(decc, format));
if (r != ds->class_rows_.end())
- row_iter = ds->current_segment_->annotation_rows.find((*r).second);
+ row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find((*r).second);
else {
// Failing that, use the decoder as a key
- row_iter = ds->current_segment_->annotation_rows.find(Row(decc));
+ row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find(Row(decc));
}
- if (row_iter == ds->current_segment_->annotation_rows.end()) {
+ if (row_iter == ds->segments_.at(ds->current_segment_id_).annotation_rows.end()) {
qDebug() << "Unexpected annotation: decoder = " << decc <<
", format = " << format;
assert(false);
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
+ // to work with
+ if ((!error_message_.isEmpty()) && (get_input_segment_count() == 0))
+ return;
+
if (!logic_mux_thread_.joinable())
begin_decode();
else
projects / pulseview.git / blobdiff