projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced using namespace with using class directives
[pulseview.git]
/
pv
/
data
/
snapshot.cpp
diff --git
a/pv/data/snapshot.cpp
b/pv/data/snapshot.cpp
index afd1e43e7c7b3169e792adb4336db4b171fcfd8c..85f54e784a1174cc0023ae687964ddc6c9ef6165 100644
(file)
--- a/
pv/data/snapshot.cpp
+++ b/
pv/data/snapshot.cpp
@@
-24,7
+24,8
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-using namespace boost;
+using boost::lock_guard;
+using boost::recursive_mutex;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-50,10
+51,16
@@
uint64_t Snapshot::get_sample_count() const
return _sample_count;
}
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;