X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsegment.hpp;h=4c6c36af3c3b0c0b6245ae0e257a2f1000992ae2;hp=513b7dbd9412fdc03883e7c4991083551923df60;hb=65c92359634f672e5f472a5214719dabc7e20883;hpb=26a883ede0bcf68d087eda5dd2082890d36c7aef

diff --git a/pv/data/segment.hpp b/pv/data/segment.hpp
index 513b7dbd..4c6c36af 100644
--- a/pv/data/segment.hpp
+++ b/pv/data/segment.hpp
@@ -23,10 +23,15 @@
 
 #include "pv/util.hpp"
 
-#include <thread>
 #include <mutex>
+#include <thread>
 #include <vector>
 
+#include <QObject>
+
+using std::recursive_mutex;
+using std::vector;
+
 namespace SegmentTest {
 struct SmallSize8Single;
 struct MediumSize8Single;
@@ -36,8 +41,9 @@ struct MediumSize32Single;
 struct MaxSize32Single;
 struct MediumSize32Multi;
 struct MaxSize32Multi;
+struct MaxSize32MultiAtOnce;
 struct MaxSize32MultiIterated;
-}
+}  // namespace SegmentTest
 
 namespace pv {
 namespace data {
@@ -45,16 +51,17 @@ namespace data {
 typedef struct {
 	uint64_t sample_index, chunk_num, chunk_offs;
 	uint8_t* chunk;
-	uint8_t* value;
-} SegmentRawDataIterator;
+} SegmentDataIterator;
 
-class Segment
+class Segment : public QObject
 {
+	Q_OBJECT
+
 private:
-	static const uint64_t MaxChunkSize = 10*1024*1024;  /* 10MiB */
+	static const uint64_t MaxChunkSize;
 
 public:
-	Segment(uint64_t samplerate, unsigned int unit_size);
+	Segment(uint32_t segment_id, uint64_t samplerate, unsigned int unit_size);
 
 	virtual ~Segment();
 
@@ -67,17 +74,26 @@ public:
 
 	unsigned int unit_size() const;
 
+	uint32_t segment_id() const;
+
+	void set_complete();
+	bool is_complete() const;
+
+	void free_unused_memory();
+
 protected:
 	void append_single_sample(void *data);
 	void append_samples(void *data, uint64_t samples);
-	uint8_t* get_raw_samples(uint64_t start, uint64_t count) const;
+	void get_raw_samples(uint64_t start, uint64_t count, uint8_t *dest) const;
 
-	SegmentRawDataIterator* begin_raw_sample_iteration(uint64_t start) const;
-	void continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase) const;
-	void end_raw_sample_iteration(SegmentRawDataIterator* it) const;
+	SegmentDataIterator* begin_sample_iteration(uint64_t start);
+	void continue_sample_iteration(SegmentDataIterator* it, uint64_t increase);
+	void end_sample_iteration(SegmentDataIterator* it);
+	uint8_t* get_iterator_value(SegmentDataIterator* it);
 
-	mutable std::recursive_mutex mutex_;
-	std::vector<uint8_t*> data_chunks_;
+	uint32_t segment_id_;
+	mutable recursive_mutex mutex_;
+	vector<uint8_t*> data_chunks_;
 	uint8_t* current_chunk_;
 	uint64_t used_samples_, unused_samples_;
 	uint64_t sample_count_;
@@ -85,6 +101,9 @@ protected:
 	double samplerate_;
 	uint64_t chunk_size_;
 	unsigned int unit_size_;
+	int iterator_count_;
+	bool mem_optimization_requested_;
+	bool is_complete_;
 
 	friend struct SegmentTest::SmallSize8Single;
 	friend struct SegmentTest::MediumSize8Single;
@@ -94,6 +113,7 @@ protected:
 	friend struct SegmentTest::MaxSize32Single;
 	friend struct SegmentTest::MediumSize32Multi;
 	friend struct SegmentTest::MaxSize32Multi;
+	friend struct SegmentTest::MaxSize32MultiAtOnce;
 	friend struct SegmentTest::MaxSize32MultiIterated;
 };