X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsnapshot.cpp;h=2f3f041346b3a96709b21d529c7f5cd2747b7b48;hb=bb3030b34e44733036acdfe5b4d4ec0705146831;hp=85f54e784a1174cc0023ae687964ddc6c9ef6165;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git

diff --git a/pv/data/snapshot.cpp b/pv/data/snapshot.cpp
index 85f54e78..2f3f0413 100644
--- a/pv/data/snapshot.cpp
+++ b/pv/data/snapshot.cpp
@@ -24,8 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-using boost::lock_guard;
-using boost::recursive_mutex;
+using std::lock_guard;
+using std::recursive_mutex;
 
 namespace pv {
 namespace data {
@@ -33,6 +33,7 @@ namespace data {
 Snapshot::Snapshot(int unit_size) :
 	_data(NULL),
 	_sample_count(0),
+	_capacity(0),
 	_unit_size(unit_size)
 {
 	lock_guard<recursive_mutex> lock(_mutex);
@@ -56,11 +57,35 @@ int Snapshot::unit_size() const
 	return _unit_size;
 }
 
+void Snapshot::set_capacity(const uint64_t new_capacity)
+{
+	lock_guard<recursive_mutex> lock(_mutex);
+
+	assert(_capacity >= _sample_count);
+	if (new_capacity > _capacity) {
+		_capacity = new_capacity;
+		_data = realloc(_data, (new_capacity * _unit_size) + sizeof(uint64_t));
+	}
+}
+
+uint64_t Snapshot::capacity() const
+{
+	lock_guard<recursive_mutex> lock(_mutex);
+	return _capacity;
+}
+
 void Snapshot::append_data(void *data, uint64_t samples)
 {
 	lock_guard<recursive_mutex> lock(_mutex);
-	_data = realloc(_data, (_sample_count + samples) * _unit_size +
-		sizeof(uint64_t));
+
+	assert(_capacity >= _sample_count);
+
+	// Ensure there's enough capacity to copy.
+	const uint64_t free_space = _capacity - _sample_count;
+	if (free_space < samples) {
+		set_capacity(_sample_count + samples);
+	}
+
 	memcpy((uint8_t*)_data + _sample_count * _unit_size,
 		data, samples * _unit_size);
 	_sample_count += samples;