projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: When lacking input, retry only when data is available
[pulseview.git]
/
pv
/
data
/
decodesignal.cpp
diff --git
a/pv/data/decodesignal.cpp
b/pv/data/decodesignal.cpp
index 1e0053910a9f3a68e3e948c70a817127f5c553a0..8483d91d0ce4a2b41de67a07605d2a757d761137 100644
(file)
--- a/
pv/data/decodesignal.cpp
+++ b/
pv/data/decodesignal.cpp
@@
-158,7
+158,8
@@
void DecodeSignal::reset_decode(bool shutting_down)
if (!error_message_.isEmpty()) {
error_message_ = QString();
if (!error_message_.isEmpty()) {
error_message_ = QString();
- qDebug().noquote().nospace() << name() << ": Error cleared";
+ // TODO Emulate noquote()
+ qDebug().nospace() << name() << ": Error cleared";
}
decode_reset();
}
decode_reset();
@@
-588,7
+589,8
@@
void DecodeSignal::restore_settings(QSettings &settings)
void DecodeSignal::set_error_message(QString msg)
{
error_message_ = msg;
void DecodeSignal::set_error_message(QString msg)
{
error_message_ = msg;
- qDebug().noquote().nospace() << name() << ": " << msg;
+ // TODO Emulate noquote()
+ qDebug().nospace() << name() << ": " << msg;
}
uint32_t DecodeSignal::get_input_segment_count() const
}
uint32_t DecodeSignal::get_input_segment_count() const
@@
-785,7
+787,9
@@
void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c
uint8_t* output = new uint8_t[(end - start) * output_segment->unit_size()];
unsigned int signal_count = signal_data.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;
int bitpos = 0;
uint8_t bytepos = 0;
@@
-855,7
+859,7
@@
void DecodeSignal::logic_mux_proc()
// ...and process the newly muxed logic data
decode_input_cond_.notify_one();
// ...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) {
}
if (samples_to_process == 0) {
@@
-979,9
+983,8
@@
void DecodeSignal::decode_proc()
segments_.at(current_segment_id_).samplerate = input_segment->samplerate();
segments_.at(current_segment_id_).start_time = input_segment->start_time();
segments_.at(current_segment_id_).samplerate = input_segment->samplerate();
segments_.at(current_segment_id_).start_time = input_segment->start_time();
- // Reset decoder state
- stop_srd_session();
- start_srd_session();
+ // Reset decoder state but keep the decoder stack intact
+ terminate_srd_session();
} else {
// All segments have been processed
decode_finished();
} else {
// All segments have been processed
decode_finished();
@@
-1142,6
+1145,9
@@
void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa
DecodeSignal *const ds = (DecodeSignal*)decode_signal;
assert(ds);
DecodeSignal *const ds = (DecodeSignal*)decode_signal;
assert(ds);
+ if (ds->decode_interrupt_)
+ return;
+
lock_guard<mutex> lock(ds->output_mutex_);
// Find the row
lock_guard<mutex> lock(ds->output_mutex_);
// Find the row
@@
-1193,6
+1199,12
@@
void DecodeSignal::on_data_cleared()
void DecodeSignal::on_data_received()
{
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
if (!logic_mux_thread_.joinable())
begin_decode();
else