Segment: Do not alter chunks when there are active iterators

[pulseview.git] / pv / data / logicsegment.hpp

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 59cca86eca3a282b8baf0e0f3f24d1b141be8a10..c450f0a905d9a96391e5ca759a65f06279acc225 100644 (file)
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -25,6 +25,8 @@
 #include <utility>
 #include <vector>
 
+#include <QObject>
+
 namespace sigrok {
        class Logic;
 }
@@ -40,8 +42,18 @@ struct LongPulses;
 namespace pv {
 namespace data {
 
-class LogicSegment : public Segment
+class Logic;
+
+typedef struct {
+       uint64_t sample_index, chunk_num, chunk_offs;
+       uint8_t* chunk;
+       uint8_t* value;
+} SegmentLogicDataIterator;
+
+class LogicSegment : public QObject, public Segment
 {
+       Q_OBJECT
+
 private:
        struct MipMapLevel
        {
@@ -61,15 +73,17 @@ public:
        typedef std::pair<int64_t, bool> EdgePair;
 
 public:
-       LogicSegment(std::shared_ptr<sigrok::Logic> logic,
-               uint64_t samplerate, uint64_t expected_num_samples = 0);
+       LogicSegment(pv::data::Logic& owner, std::shared_ptr<sigrok::Logic> data, uint64_t samplerate);
 
        virtual ~LogicSegment();
 
        void append_payload(std::shared_ptr<sigrok::Logic> logic);
 
-       void get_samples(uint8_t *const data,
-               int64_t start_sample, int64_t end_sample) const;
+       const uint8_t* get_samples(int64_t start_sample, int64_t end_sample) const;
+
+       SegmentLogicDataIterator* begin_sample_iteration(uint64_t start);
+       void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase);
+       void end_sample_iteration(SegmentLogicDataIterator* it);
 
 private:
        uint64_t unpack_sample(const uint8_t *ptr) const;
@@ -79,7 +93,7 @@ private:
 
        void append_payload_to_mipmap();
 
-       uint64_t get_sample(uint64_t index) const;
+       uint64_t get_unpacked_sample(uint64_t index) const;
 
 public:
        /**
@@ -102,6 +116,8 @@ private:
        static uint64_t pow2_ceil(uint64_t x, unsigned int power);
 
 private:
+       Logic& owner_;
+
        struct MipMapLevel mip_map_[ScaleStepCount];
        uint64_t last_append_sample_;