X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=4739b60675ab3e97ee9496ebc1a1d642ccf12bca;hp=ecdacdefa6ec09d53c6a1e8b343b40e6f661e96b;hb=e06cf18db72c518d11f90e9f96dfc3aeed85314f;hpb=90ca4cc8a481c6ac6fde754fbcdf6ca2f3ba2231

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index ecdacdef..4739b606 100644
--- 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();
-		qDebug().noquote().nospace() << name() << ": Error cleared";
+		// TODO Emulate noquote()
+		qDebug().nospace() << name() << ": Error cleared";
 	}
 
 	decode_reset();
@@ -588,7 +589,8 @@ void DecodeSignal::restore_settings(QSettings &settings)
 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
@@ -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();
 
-	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;
 
@@ -855,7 +859,7 @@ void DecodeSignal::logic_mux_proc()
 
 				// ...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) {
@@ -898,6 +902,13 @@ void DecodeSignal::decode_data(
 		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];
 		input_segment->get_samples(i, chunk_end, chunk);
@@ -911,11 +922,6 @@ void DecodeSignal::decode_data(
 
 		delete[] chunk;
 
-		{
-			lock_guard<mutex> lock(output_mutex_);
-			segments_.at(current_segment_id_).samples_decoded = chunk_end;
-		}
-
 		// Notify the frontend that we processed some data and
 		// possibly have new annotations as well
 		new_annotations();
@@ -1141,6 +1147,9 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa
 	DecodeSignal *const ds = (DecodeSignal*)decode_signal;
 	assert(ds);
 
+	if (ds->decode_interrupt_)
+		return;
+
 	lock_guard<mutex> lock(ds->output_mutex_);
 
 	// Find the row
@@ -1192,6 +1201,12 @@ void DecodeSignal::on_data_cleared()
 
 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