X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Flogicdatasnapshot.cpp;h=b264980b3078271801a0ad808a737af6ffe859fb;hb=7d29656f1e4de945eee3a9ea5dbc0ef88c4a7e30;hp=b78047d761ca29c351c1300230aa94553cf5434b;hpb=60b0c2daf2291a8358e3905515c1dfa47956590f;p=pulseview.git

diff --git a/pv/logicdatasnapshot.cpp b/pv/logicdatasnapshot.cpp
index b78047d..b264980 100644
--- a/pv/logicdatasnapshot.cpp
+++ b/pv/logicdatasnapshot.cpp
@@ -29,6 +29,7 @@
 
 #include "logicdatasnapshot.h"
 
+using namespace boost;
 using namespace std;
 
 namespace pv {
@@ -43,12 +44,14 @@ LogicDataSnapshot::LogicDataSnapshot(
 	DataSnapshot(logic.unitsize),
 	_last_append_sample(0)
 {
+	lock_guard<recursive_mutex> lock(_mutex);
 	memset(_mip_map, 0, sizeof(_mip_map));
 	append_payload(logic);
 }
 
 LogicDataSnapshot::~LogicDataSnapshot()
 {
+	lock_guard<recursive_mutex> lock(_mutex);
 	BOOST_FOREACH(MipMapLevel &l, _mip_map)
 		free(l.data);
 }
@@ -58,6 +61,8 @@ void LogicDataSnapshot::append_payload(
 {
 	assert(_unit_size == logic.unitsize);
 
+	lock_guard<recursive_mutex> lock(_mutex);
+
 	append_data(logic.data, logic.length);
 
 	// Generate the first mip-map from the data
@@ -184,6 +189,8 @@ void LogicDataSnapshot::get_subsampled_edges(
 	assert(sig_index >= 0);
 	assert(sig_index < SR_MAX_NUM_PROBES);
 
+	lock_guard<recursive_mutex> lock(_mutex);
+
 	const uint64_t block_length = (uint64_t)max(min_length, 1.0f);
 	const unsigned int min_level = max((int)floorf(logf(min_length) /
 		LogMipMapScaleFactor) - 1, 0);
@@ -206,8 +213,7 @@ void LogicDataSnapshot::get_subsampled_edges(
 			const uint64_t final_index = min(end,
 				pow2_ceil(index, MipMapScalePower));
 
-			for(index;
-				index < final_index &&
+			for(; index < final_index &&
 				(index & ~(~0 << MipMapScalePower)) != 0;
 				index++)
 			{
@@ -312,7 +318,7 @@ void LogicDataSnapshot::get_subsampled_edges(
 			// do a linear search for the next transition within the
 			// block
 			if(min_length < MipMapScaleFactor) {
-				for(index; index < end; index++) {
+				for(; index < end; index++) {
 					const bool sample = (get_sample(index) &
 						sig_mask) != 0;
 					if(sample != last_sample)