X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsegment.hpp;h=18f1aed77192978ce1a87cbb86aaf7b929672f73;hp=b46af4925184fbf3b6bab8c14ef16a6eec2d5dc2;hb=85a702806a15852f3684645dffdc38cb30274481;hpb=6f925ba9d6faf1077b73c5a5808259576081716a

diff --git a/pv/data/segment.hpp b/pv/data/segment.hpp
index b46af49..18f1aed 100644
--- a/pv/data/segment.hpp
+++ b/pv/data/segment.hpp
@@ -23,8 +23,8 @@
 
 #include "pv/util.hpp"
 
-#include <thread>
 #include <mutex>
+#include <thread>
 #include <vector>
 
 using std::recursive_mutex;
@@ -39,8 +39,9 @@ struct MediumSize32Single;
 struct MaxSize32Single;
 struct MediumSize32Multi;
 struct MaxSize32Multi;
+struct MaxSize32MultiAtOnce;
 struct MaxSize32MultiIterated;
-}
+}  // namespace SegmentTest
 
 namespace pv {
 namespace data {
@@ -57,7 +58,7 @@ private:
 	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();
 
@@ -70,17 +71,23 @@ 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);
 	void continue_raw_sample_iteration(SegmentRawDataIterator* it, uint64_t increase);
 	void end_raw_sample_iteration(SegmentRawDataIterator* it);
 
+	uint32_t segment_id_;
 	mutable recursive_mutex mutex_;
 	vector<uint8_t*> data_chunks_;
 	uint8_t* current_chunk_;
@@ -92,6 +99,7 @@ protected:
 	unsigned int unit_size_;
 	int iterator_count_;
 	bool mem_optimization_requested_;
+	bool is_complete_;
 
 	friend struct SegmentTest::SmallSize8Single;
 	friend struct SegmentTest::MediumSize8Single;
@@ -101,6 +109,7 @@ protected:
 	friend struct SegmentTest::MaxSize32Single;
 	friend struct SegmentTest::MediumSize32Multi;
 	friend struct SegmentTest::MaxSize32Multi;
+	friend struct SegmentTest::MaxSize32MultiAtOnce;
 	friend struct SegmentTest::MaxSize32MultiIterated;
 };