MathSignal: Rename sig_sample() to sample()

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

diff --git a/pv/data/segment.cpp b/pv/data/segment.cpp
index a71d49ca6d27b9f2098a844b4c425c9fdfe765f3..18aabedbedd348bf0656635f60cb991757713e32 100644 (file)
--- a/pv/data/segment.cpp
+++ b/pv/data/segment.cpp
@@ -54,7 +54,7 @@ Segment::Segment(uint32_t segment_id, uint64_t samplerate, unsigned int unit_siz
        chunk_size_ = min(MaxChunkSize, (MaxChunkSize / unit_size_) * unit_size_);
 
        // Create the initial chunk
-       current_chunk_ = new uint8_t[chunk_size_];
+       current_chunk_ = new uint8_t[chunk_size_ + 7];  /* FIXME +7 is workaround for #1284 */
        data_chunks_.push_back(current_chunk_);
        used_samples_ = 0;
        unused_samples_ = chunk_size_ / unit_size_;
@@ -70,7 +70,6 @@ Segment::~Segment()
 
 uint64_t Segment::get_sample_count() const
 {
-       lock_guard<recursive_mutex> lock(mutex_);
        return sample_count_;
 }
 
@@ -102,6 +101,8 @@ uint32_t Segment::segment_id() const
 void Segment::set_complete()
 {
        is_complete_ = true;
+
+       completed();
 }
 
 bool Segment::is_complete() const
@@ -121,7 +122,7 @@ void Segment::free_unused_memory()
 
        if (current_chunk_) {
                // No more data will come in, so re-create the last chunk accordingly
-               uint8_t* resized_chunk = new uint8_t[used_samples_ * unit_size_];
+               uint8_t* resized_chunk = new uint8_t[used_samples_ * unit_size_ + 7];  /* FIXME +7 is workaround for #1284 */
                memcpy(resized_chunk, current_chunk_, used_samples_ * unit_size_);
 
                delete[] current_chunk_;
@@ -144,7 +145,7 @@ void Segment::append_single_sample(void *data)
        unused_samples_--;
 
        if (unused_samples_ == 0) {
-               current_chunk_ = new uint8_t[chunk_size_];
+               current_chunk_ = new uint8_t[chunk_size_ + 7];  /* FIXME +7 is workaround for #1284 */
                data_chunks_.push_back(current_chunk_);
                used_samples_ = 0;
                unused_samples_ = chunk_size_ / unit_size_;
@@ -190,7 +191,7 @@ void Segment::append_samples(void* data, uint64_t samples)
                                // This way, memory allocation will fail early enough to let
                                // PV remain alive. Otherwise, PV will crash in a random
                                // memory-allocating part of the application.
-                               current_chunk_ = new uint8_t[chunk_size_];
+                               current_chunk_ = new uint8_t[chunk_size_ + 7];  /* FIXME +7 is workaround for #1284 */
 
                                const int dummy_size = 2 * chunk_size_;
                                auto dummy_chunk = new uint8_t[dummy_size];
@@ -211,21 +212,34 @@ void Segment::append_samples(void* data, uint64_t samples)
        sample_count_ += samples;
 }
 
-void Segment::get_raw_samples(uint64_t start, uint64_t count,
-       uint8_t* dest) const
+const uint8_t* Segment::get_raw_sample(uint64_t sample_num) const
+{
+       assert(sample_num <= sample_count_);
+
+       uint64_t chunk_num = (sample_num * unit_size_) / chunk_size_;
+       uint64_t chunk_offs = (sample_num * unit_size_) % chunk_size_;
+
+       lock_guard<recursive_mutex> lock(mutex_);  // Because of free_unused_memory()
+
+       const uint8_t* chunk = data_chunks_[chunk_num];
+
+       return chunk + chunk_offs;
+}
+
+void Segment::get_raw_samples(uint64_t start, uint64_t count, uint8_t* dest) const
 {
        assert(start < sample_count_);
        assert(start + count <= sample_count_);
        assert(count > 0);
        assert(dest != nullptr);
 
-       lock_guard<recursive_mutex> lock(mutex_);
-
        uint8_t* dest_ptr = dest;
 
        uint64_t chunk_num = (start * unit_size_) / chunk_size_;
        uint64_t chunk_offs = (start * unit_size_) % chunk_size_;
 
+       lock_guard<recursive_mutex> lock(mutex_);  // Because of free_unused_memory()
+
        while (count > 0) {
                const uint8_t* chunk = data_chunks_[chunk_num];
 
@@ -289,5 +303,12 @@ uint8_t* Segment::get_iterator_value(SegmentDataIterator* it)
        return (it->chunk + it->chunk_offs);
 }
 
+uint64_t Segment::get_iterator_valid_length(SegmentDataIterator* it)
+{
+       assert(it->sample_index <= (sample_count_ - 1));
+
+       return ((chunk_size_ - it->chunk_offs) / unit_size_);
+}
+
 } // namespace data
 } // namespace pv