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

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index cfe9aaf..64d9cd6 100644
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -39,7 +39,9 @@ Segment::Segment(uint64_t samplerate, unsigned int unit_size) :
 	sample_count_(0),
 	start_time_(0),
 	samplerate_(samplerate),
-	unit_size_(unit_size)
+	unit_size_(unit_size),
+	iterator_count_(0),
+	mem_optimization_requested_(false)
 {
 	lock_guard<recursive_mutex> lock(mutex_);
 	assert(unit_size_ > 0);
@@ -94,6 +96,12 @@ void Segment::free_unused_memory()
 {
 	lock_guard<recursive_mutex> lock(mutex_);
 
+	// Do not mess with the data chunks if we have iterators pointing at them
+	if (iterator_count_ > 0) {
+		mem_optimization_requested_ = true;
+		return;
+	}
+
 	// No more data will come in, so re-create the last chunk accordingly
 	uint8_t* resized_chunk = new uint8_t[used_samples_ * unit_size_];
 	memcpy(resized_chunk, current_chunk_, used_samples_ * unit_size_);
@@ -196,12 +204,14 @@ uint8_t* Segment::get_raw_samples(uint64_t start, uint64_t count) const
 	return dest;
 }
 
-SegmentRawDataIterator* Segment::begin_raw_sample_iteration(uint64_t start) const
+SegmentRawDataIterator* Segment::begin_raw_sample_iteration(uint64_t start)
 {
 	SegmentRawDataIterator* it = new SegmentRawDataIterator;
 
 	assert(start < sample_count_);
 
+	iterator_count_++;
+
 	it->sample_index = start;
 	it->chunk_num = (start * unit_size_) / chunk_size_;
 	it->chunk_offs = (start * unit_size_) % chunk_size_;
@@ -211,7 +221,7 @@ SegmentRawDataIterator* Segment::begin_raw_sample_iteration(uint64_t start) cons
 	return it;
 }
 
-void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase) const
+void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase)
 {
 	lock_guard<recursive_mutex> lock(mutex_);
 
@@ -233,9 +243,16 @@ void Segment::continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t
 	it->value = it->chunk + it->chunk_offs;
 }
 
-void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it) const
+void Segment::end_raw_sample_iteration(SegmentRawDataIterator* it)
 {
 	delete it;
+
+	iterator_count_--;
+
+	if ((iterator_count_ == 0) && mem_optimization_requested_) {
+		mem_optimization_requested_ = false;
+		free_unused_memory();
+	}
 }