X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsnapshot.cpp;h=754a456cc8f2e6c078cfd5a46e8b1c756571f79a;hb=27d7c96b57d967edd8bcde9bb5570d573a0ef474;hp=5665d35f8c3d58916b3df6ed41c11227f13d39cf;hpb=5cef1ea3c6a3ed3851c631354bf9168a154179dc;p=pulseview.git

diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp
index 5665d35f..754a456c 100644
--- a/pv/data/logicsnapshot.cpp
+++ b/pv/data/logicsnapshot.cpp
@@ -29,8 +29,11 @@
 
 #include "logicsnapshot.h"
 
-using namespace boost;
-using namespace std;
+using boost::lock_guard;
+using boost::recursive_mutex;
+using std::max;
+using std::min;
+using std::pair;
 
 namespace pv {
 namespace data {
@@ -40,10 +43,13 @@ const int LogicSnapshot::MipMapScaleFactor = 1 << MipMapScalePower;
 const float LogicSnapshot::LogMipMapScaleFactor = logf(MipMapScaleFactor);
 const uint64_t LogicSnapshot::MipMapDataUnit = 64*1024;	// bytes
 
-LogicSnapshot::LogicSnapshot(const sr_datafeed_logic &logic) :
+LogicSnapshot::LogicSnapshot(const sr_datafeed_logic &logic,
+                             const uint64_t expected_num_samples) :
 	Snapshot(logic.unitsize),
 	_last_append_sample(0)
 {
+	set_capacity(expected_num_samples);
+
 	lock_guard<recursive_mutex> lock(_mutex);
 	memset(_mip_map, 0, sizeof(_mip_map));
 	append_payload(logic);
@@ -70,14 +76,33 @@ void LogicSnapshot::append_payload(
 	append_payload_to_mipmap();
 }
 
-void LogicSnapshot::reallocate_mip_map(MipMapLevel &m)
+void LogicSnapshot::get_samples(uint8_t *const data,
+	int64_t start_sample, int64_t end_sample) const
+{
+	assert(data);
+	assert(start_sample >= 0);
+	assert(start_sample <= (int64_t)_sample_count);
+	assert(end_sample >= 0);
+	assert(end_sample <= (int64_t)_sample_count);
+	assert(start_sample <= end_sample);
+
+	lock_guard<recursive_mutex> lock(_mutex);
+
+	const size_t size = (end_sample - start_sample) * _unit_size;
+	memcpy(data, (const uint8_t*)_data + start_sample, size);
+}
+
+void LogicSnapshot::reallocate_mipmap_level(MipMapLevel &m)
 {
 	const uint64_t new_data_length = ((m.length + MipMapDataUnit - 1) /
 		MipMapDataUnit) * MipMapDataUnit;
 	if (new_data_length > m.data_length)
 	{
 		m.data_length = new_data_length;
-		m.data = realloc(m.data, new_data_length * _unit_size);
+
+		// Padding is added to allow for the uint64_t write word
+		m.data = realloc(m.data, new_data_length * _unit_size +
+			sizeof(uint64_t));
 	}
 }
 
@@ -98,14 +123,12 @@ void LogicSnapshot::append_payload_to_mipmap()
 	if (m0.length == prev_length)
 		return;
 
-	reallocate_mip_map(m0);
+	reallocate_mipmap_level(m0);
 
 	dest_ptr = (uint8_t*)m0.data + prev_length * _unit_size;
 
 	// Iterate through the samples to populate the first level mipmap
-	accumulator = 0;
-	diff_counter = MipMapScaleFactor;
-	const uint8_t *end_src_ptr = (uint8_t*)_data +
+	const uint8_t *const end_src_ptr = (uint8_t*)_data +
 		m0.length * _unit_size * MipMapScaleFactor;
 	for (src_ptr = (uint8_t*)_data +
 		prev_length * _unit_size * MipMapScaleFactor;
@@ -140,12 +163,12 @@ void LogicSnapshot::append_payload_to_mipmap()
 		if (m.length == prev_length)
 			break;
 
-		reallocate_mip_map(m);
+		reallocate_mipmap_level(m);
 
 		// Subsample the level lower level
 		src_ptr = (uint8_t*)ml.data +
 			_unit_size * prev_length * MipMapScaleFactor;
-		const uint8_t *end_dest_ptr =
+		const uint8_t *const end_dest_ptr =
 			(uint8_t*)m.data + _unit_size * m.length;
 		for (dest_ptr = (uint8_t*)m.data +
 			_unit_size * prev_length;
@@ -187,7 +210,7 @@ void LogicSnapshot::get_subsampled_edges(
 	assert(start <= end);
 	assert(min_length > 0);
 	assert(sig_index >= 0);
-	assert(sig_index < SR_MAX_NUM_PROBES);
+	assert(sig_index < 64);
 
 	lock_guard<recursive_mutex> lock(_mutex);
 
@@ -204,7 +227,10 @@ void LogicSnapshot::get_subsampled_edges(
 	{
 		//----- Continue to search -----//
 		level = min_level;
-		fast_forward = true;
+
+		// We cannot fast-forward if there is no mip-map data at
+		// at the minimum level.
+		fast_forward = (_mip_map[level].data != NULL);
 
 		if (min_length < MipMapScaleFactor)
 		{
@@ -241,7 +267,8 @@ void LogicSnapshot::get_subsampled_edges(
 			// We can fast forward only if there was no change
 			const bool sample =
 				(get_sample(index) & sig_mask) != 0;
-			fast_forward = last_sample == sample;
+			if (last_sample != sample)
+				fast_forward = false;
 		}
 
 		if (fast_forward) {
@@ -342,8 +369,10 @@ void LogicSnapshot::get_subsampled_edges(
 	}
 
 	// Add the final state
-	edges.push_back(pair<int64_t, bool>(end,
-		get_sample(end) & sig_mask));
+	const bool end_sample = get_sample(end) & sig_mask;
+	if (last_sample != end_sample)
+		edges.push_back(pair<int64_t, bool>(end, end_sample));
+	edges.push_back(pair<int64_t, bool>(end + 1, end_sample));
 }
 
 uint64_t LogicSnapshot::get_subsample(int level, uint64_t offset) const