X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsegment.cpp;h=905b79274efeb6ee5ddebd7045348c5da85d9db3;hp=64d9cd66081a414aa1dc5460e64ec4cdc94d868e;hb=0c5fe73e5b66bf31d2dcfa2b2846a86cd2fdf0c4;hpb=c70e34649be658e7a443d5e68abe16dd55d53bf2

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index 64d9cd66..905b7927 100644
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -20,20 +20,18 @@
 
 #include "segment.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <vector>
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
 
 using std::lock_guard;
+using std::min;
 using std::recursive_mutex;
-using std::vector;
 
 namespace pv {
 namespace data {
 
-const uint64_t Segment::MaxChunkSize = 10*1024*1024;  /* 10MiB */
+const uint64_t Segment::MaxChunkSize = 10 * 1024 * 1024;  /* 10MiB */
 
 Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
 	sample_count_(0),
@@ -48,8 +46,7 @@ Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
 
 	// Determine the number of samples we can fit in one chunk
 	// without exceeding MaxChunkSize
-	chunk_size_ = std::min(MaxChunkSize,
-		(MaxChunkSize / unit_size_) * unit_size_);
+	chunk_size_ = min(MaxChunkSize, (MaxChunkSize / unit_size_) * unit_size_);
 
 	// Create the initial chunk
 	current_chunk_ = new uint8_t[chunk_size_];
@@ -120,8 +117,7 @@ void Segment::append_single_sample(void *data)
 	// There will always be space for at least one sample in
 	// the current chunk, so we do not need to test for space
 
-	memcpy(current_chunk_ + (used_samples_ * unit_size_),
-		data, unit_size_);
+	memcpy(current_chunk_ + (used_samples_ * unit_size_), data, unit_size_);
 	used_samples_++;
 	unused_samples_--;
 
@@ -139,35 +135,38 @@ void Segment::append_samples(void* data, uint64_t samples)
 {
 	lock_guard<recursive_mutex> lock(mutex_);
 
-	if (unused_samples_ >= samples) {
-		// All samples fit into the current chunk
-		memcpy(current_chunk_ + (used_samples_ * unit_size_),
-			data, (samples * unit_size_));
-		used_samples_ += samples;
-		unused_samples_ -= samples;
-	} else {
-		// Only a part of the samples fit, split data up between chunks
-		memcpy(current_chunk_ + (used_samples_ * unit_size_),
-			data, (unused_samples_ * unit_size_));
-		const uint64_t remaining_samples = samples - unused_samples_;
-
-		// If we're out of memory, this will throw std::bad_alloc
-		current_chunk_ = new uint8_t[chunk_size_];
-		data_chunks_.push_back(current_chunk_);
-		memcpy(current_chunk_, (uint8_t*)data + (unused_samples_ * unit_size_),
-			(remaining_samples * unit_size_));
-
-		used_samples_ = remaining_samples;
-		unused_samples_ = (chunk_size_ / unit_size_) - remaining_samples;
-	}
-
-	if (unused_samples_ == 0) {
-		// If we're out of memory, this will throw std::bad_alloc
-		current_chunk_ = new uint8_t[chunk_size_];
-		data_chunks_.push_back(current_chunk_);
-		used_samples_ = 0;
-		unused_samples_ = chunk_size_ / unit_size_;
-	}
+	const uint8_t* data_byte_ptr = (uint8_t*)data;
+	uint64_t remaining_samples = samples;
+	uint64_t data_offset = 0;
+
+	do {
+		uint64_t copy_count = 0;
+
+		if (remaining_samples <= unused_samples_) {
+			// All samples fit into the current chunk
+			copy_count = remaining_samples;
+		} else {
+			// Only a part of the samples fit, fill up current chunk
+			copy_count = unused_samples_;
+		}
+
+		const uint8_t* dest = &(current_chunk_[used_samples_ * unit_size_]);
+		const uint8_t* src = &(data_byte_ptr[data_offset]);
+		memcpy((void*)dest, (void*)src, (copy_count * unit_size_));
+
+		used_samples_ += copy_count;
+		unused_samples_ -= copy_count;
+		remaining_samples -= copy_count;
+		data_offset += (copy_count * unit_size_);
+
+		if (unused_samples_ == 0) {
+			// If we're out of memory, this will throw std::bad_alloc
+			current_chunk_ = new uint8_t[chunk_size_];
+			data_chunks_.push_back(current_chunk_);
+			used_samples_ = 0;
+			unused_samples_ = chunk_size_ / unit_size_;
+		}
+	} while (remaining_samples > 0);
 
 	sample_count_ += samples;
 }
@@ -189,7 +188,7 @@ uint8_t* Segment::get_raw_samples(uint64_t start, uint64_t count) const
 	while (count > 0) {
 		const uint8_t* chunk = data_chunks_[chunk_num];
 
-		uint64_t copy_size = std::min(count * unit_size_,
+		uint64_t copy_size = min(count * unit_size_,
 			chunk_size_ - chunk_offs);
 
 		memcpy(dest_ptr, chunk + chunk_offs, copy_size);
@@ -223,16 +222,12 @@ SegmentRawDataIterator* Segment::begin_raw_sample_iteration(uint64_t start)
 
 void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase)
 {
-	lock_guard<recursive_mutex> lock(mutex_);
-
+	// Fail gracefully if we are asked to deliver data we don't have
 	if (it->sample_index > sample_count_)
-	{
-		// Fail gracefully if we are asked to deliver data we don't have
 		return;
-	} else {
-		it->sample_index += increase;
-		it->chunk_offs += (increase * unit_size_);
-	}
+
+	it->sample_index += increase;
+	it->chunk_offs += (increase * unit_size_);
 
 	if (it->chunk_offs > (chunk_size_ - 1)) {
 		it->chunk_num++;
@@ -255,6 +250,5 @@ void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it)
 	}
 }
 
-
 } // namespace data
 } // namespace pv