X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=441ff3c3df9f327a5ce25f80759eebd11073eac2;hp=51d4bae0483ec4ca2b1fb74abae54738f680bd0d;hb=27c0521002ea986b72d9675b99803665516db14c;hpb=cc10c40992278034a7d7648d34f19ff6743710db

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 51d4bae0..441ff3c3 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -57,7 +57,7 @@ const double DecoderStack::DecodeThreshold = 0.2;
 const int64_t DecoderStack::DecodeChunkLength = 4096;
 const unsigned int DecoderStack::DecodeNotifyPeriod = 65536;
 
-mutex DecoderStack::global_decode_mutex_;
+mutex DecoderStack::global_srd_mutex_;
 
 DecoderStack::DecoderStack(pv::Session &session,
 	const srd_decoder *const dec) :
@@ -272,9 +272,9 @@ uint64_t DecoderStack::max_sample_count() const
 {
 	uint64_t max_sample_count = 0;
 
-	for (auto i = rows_.cbegin(); i != rows_.end(); i++)
+	for (const auto& row : rows_)
 		max_sample_count = max(max_sample_count,
-			(*i).second.get_max_sample());
+			row.second.get_max_sample());
 
 	return max_sample_count;
 }
@@ -312,7 +312,6 @@ void DecoderStack::decode_data(
 
 	for (int64_t i = 0; !interrupt_ && i < sample_count;
 			i += chunk_sample_count) {
-		lock_guard<mutex> decode_lock(global_decode_mutex_);
 
 		const int64_t chunk_end = min(
 			i + chunk_sample_count, sample_count);
@@ -344,6 +343,9 @@ void DecoderStack::decode_proc()
 
 	assert(segment_);
 
+	// Prevent any other decode threads from accessing libsigrokdecode
+	lock_guard<mutex> srd_lock(global_srd_mutex_);
+
 	// Create the session
 	srd_session_new(&session);
 	assert(session);