X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=62f188e383d4dff662874dce86d975f0ecbdf3a9;hp=fcf572297e689f87762eabc81df96207df3000dc;hb=4cc0df94c1027add1e62dfdf81e48eda959783c9;hpb=9d22929c3588b994771e8db8f3be5b013fd35040

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index fcf57229..62f188e3 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -20,9 +20,9 @@
 #include <extdef.h>
 
 #include <cassert>
-#include <cstring>
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "logic.hpp"
 #include "logicsegment.hpp"
@@ -33,7 +33,6 @@ using std::lock_guard;
 using std::recursive_mutex;
 using std::max;
 using std::min;
-using std::pair;
 using std::shared_ptr;
 using std::vector;
 
@@ -45,18 +44,7 @@ namespace data {
 const int LogicSegment::MipMapScalePower = 4;
 const int LogicSegment::MipMapScaleFactor = 1 << MipMapScalePower;
 const float LogicSegment::LogMipMapScaleFactor = logf(MipMapScaleFactor);
-const uint64_t LogicSegment::MipMapDataUnit = 64*1024;	// bytes
-
-LogicSegment::LogicSegment(pv::data::Logic& owner, shared_ptr<sigrok::Logic> data,
-	uint64_t samplerate) :
-	Segment(samplerate, data->unit_size()),
-	owner_(owner),
-	last_append_sample_(0)
-{
-	lock_guard<recursive_mutex> lock(mutex_);
-	memset(mip_map_, 0, sizeof(mip_map_));
-	append_payload(data);
-}
+const uint64_t LogicSegment::MipMapDataUnit = 64 * 1024; // bytes
 
 LogicSegment::LogicSegment(pv::data::Logic& owner, unsigned int unit_size,
 	uint64_t samplerate) :
@@ -178,18 +166,19 @@ void LogicSegment::append_payload(void *data, uint64_t data_size)
 			prev_sample_count + 1);
 }
 
-const uint8_t* LogicSegment::get_samples(int64_t start_sample,
-	int64_t end_sample) const
+void LogicSegment::get_samples(int64_t start_sample,
+	int64_t end_sample,	uint8_t* dest) const
 {
 	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);
+	assert(dest != nullptr);
 
 	lock_guard<recursive_mutex> lock(mutex_);
 
-	return get_raw_samples(start_sample, (end_sample-start_sample));
+	get_raw_samples(start_sample, (end_sample - start_sample), dest);
 }
 
 SegmentLogicDataIterator* LogicSegment::begin_sample_iteration(uint64_t start)
@@ -269,7 +258,7 @@ void LogicSegment::append_payload_to_mipmap()
 	// Compute higher level mipmaps
 	for (unsigned int level = 1; level < ScaleStepCount; level++) {
 		MipMapLevel &m = mip_map_[level];
-		const MipMapLevel &ml = mip_map_[level-1];
+		const MipMapLevel &ml = mip_map_[level - 1];
 
 		// Expand the data buffer to fit the new samples
 		prev_length = m.length;
@@ -307,7 +296,8 @@ uint64_t LogicSegment::get_unpacked_sample(uint64_t index) const
 {
 	assert(index < sample_count_);
 
-	const uint8_t* data = get_raw_samples(index, 1);
+	uint8_t* data = new uint8_t[unit_size_];
+	get_raw_samples(index, 1, data);
 	uint64_t sample = unpack_sample(data);
 	delete[] data;
 
@@ -324,7 +314,6 @@ void LogicSegment::get_subsampled_edges(
 	bool last_sample;
 	bool fast_forward;
 
-	assert(end <= get_sample_count());
 	assert(start <= end);
 	assert(min_length > 0);
 	assert(sig_index >= 0);
@@ -332,6 +321,10 @@ void LogicSegment::get_subsampled_edges(
 
 	lock_guard<recursive_mutex> lock(mutex_);
 
+	// Make sure we only process as many samples as we have
+	if (end > get_sample_count())
+		end = get_sample_count();
+
 	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);