Don't use std:: in the code directly (where possible).

[pulseview.git] / pv / data / segment.cpp

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index f635fc387a59dc4156273ca0dd4d88602ca35a27..86211f8218f52d02eb8ed59df0e2eecf998379a9 100644 (file)
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -20,32 +20,35 @@
 
 #include "segment.hpp"
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include <cassert>
+#include <cstdlib>
+#include <cstring>
 #include <vector>
 
 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 */
+
 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);
 
        // 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_];
@@ -88,6 +91,27 @@ unsigned int Segment::unit_size() const
        return unit_size_;
 }
 
+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_);
+
+       delete[] current_chunk_;
+       current_chunk_ = resized_chunk;
+
+       data_chunks_.pop_back();
+       data_chunks_.push_back(resized_chunk);
+}
+
 void Segment::append_single_sample(void *data)
 {
        lock_guard<recursive_mutex> lock(mutex_);
@@ -164,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);
@@ -179,12 +203,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_;
@@ -194,7 +220,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_);
 
@@ -216,9 +242,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();
+       }
 }