X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsegment.cpp;h=433e7536bbf9cd973c3a2a5af4fec2666d12de1c;hp=64d9cd66081a414aa1dc5460e64ec4cdc94d868e;hb=51d3950ff93b166ce2034920b8e48594298e544a;hpb=c70e34649be658e7a443d5e68abe16dd55d53bf2

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index 64d9cd6..433e753 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_--;
 
@@ -189,7 +185,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 +219,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 +247,5 @@ void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it)
 	}
 }
 
-
 } // namespace data
 } // namespace pv