projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved form generation into Binding
[pulseview.git]
/
pv
/
data
/
snapshot.cpp
diff --git
a/pv/data/snapshot.cpp
b/pv/data/snapshot.cpp
index f3855e06c34ce9bf7cf829b5b27085f70bcb82e7..602388412f00624cc6db0cfbce81fff684b1223f 100644
(file)
--- a/
pv/data/snapshot.cpp
+++ b/
pv/data/snapshot.cpp
@@
-44,16
+44,22
@@
Snapshot::~Snapshot()
free(_data);
}
free(_data);
}
-uint64_t Snapshot::get_sample_count()
+uint64_t Snapshot::get_sample_count()
const
{
lock_guard<recursive_mutex> lock(_mutex);
return _sample_count;
}
{
lock_guard<recursive_mutex> lock(_mutex);
return _sample_count;
}
+int Snapshot::unit_size() const
+{
+ return _unit_size;
+}
+
void Snapshot::append_data(void *data, uint64_t samples)
{
lock_guard<recursive_mutex> lock(_mutex);
void Snapshot::append_data(void *data, uint64_t samples)
{
lock_guard<recursive_mutex> lock(_mutex);
- _data = realloc(_data, (_sample_count + samples) * _unit_size);
+ _data = realloc(_data, (_sample_count + samples) * _unit_size +
+ sizeof(uint64_t));
memcpy((uint8_t*)_data + _sample_count * _unit_size,
data, samples * _unit_size);
_sample_count += samples;
memcpy((uint8_t*)_data + _sample_count * _unit_size,
data, samples * _unit_size);
_sample_count += samples;