X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fsnapshot.cpp;h=c02475b7e0ca4efc8f4a2bbca228d3040e7573fd;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=602388412f00624cc6db0cfbce81fff684b1223f;hpb=6fd14a32c76a8d4548223eba546d1805d2725df0;p=pulseview.git

diff --git a/pv/data/snapshot.cpp b/pv/data/snapshot.cpp
index 60238841..c02475b7 100644
--- a/pv/data/snapshot.cpp
+++ b/pv/data/snapshot.cpp
@@ -24,14 +24,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-using namespace boost;
+using std::lock_guard;
+using std::recursive_mutex;
 
 namespace pv {
 namespace data {
 
-Snapshot::Snapshot(int unit_size) :
-	_data(NULL),
+Snapshot::Snapshot(unsigned int unit_size) :
 	_sample_count(0),
+	_capacity(0),
 	_unit_size(unit_size)
 {
 	lock_guard<recursive_mutex> lock(_mutex);
@@ -41,7 +42,6 @@ Snapshot::Snapshot(int unit_size) :
 Snapshot::~Snapshot()
 {
 	lock_guard<recursive_mutex> lock(_mutex);
-	free(_data);
 }
 
 uint64_t Snapshot::get_sample_count() const
@@ -50,17 +50,41 @@ uint64_t Snapshot::get_sample_count() const
 	return _sample_count;
 }
 
-int Snapshot::unit_size() const
+unsigned 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.resize((new_capacity * _unit_size) + sizeof(uint64_t));
+	}
+}
+
+uint64_t Snapshot::capacity() const
+{
+	lock_guard<recursive_mutex> lock(_mutex);
+	return _data.size();
+}
+
 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));
-	memcpy((uint8_t*)_data + _sample_count * _unit_size,
+
+	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.data() + _sample_count * _unit_size,
 		data, samples * _unit_size);
 	_sample_count += samples;
 }