projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.gitignore: Ignore vim .swo files
[pulseview.git]
/
pv
/
data
/
snapshot.cpp
diff --git
a/pv/data/snapshot.cpp
b/pv/data/snapshot.cpp
index 2f3f041346b3a96709b21d529c7f5cd2747b7b48..c02475b7e0ca4efc8f4a2bbca228d3040e7573fd 100644
(file)
--- a/
pv/data/snapshot.cpp
+++ b/
pv/data/snapshot.cpp
@@
-30,8
+30,7
@@
using std::recursive_mutex;
namespace pv {
namespace data {
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)
_sample_count(0),
_capacity(0),
_unit_size(unit_size)
@@
-43,7
+42,6
@@
Snapshot::Snapshot(int unit_size) :
Snapshot::~Snapshot()
{
lock_guard<recursive_mutex> lock(_mutex);
Snapshot::~Snapshot()
{
lock_guard<recursive_mutex> lock(_mutex);
- free(_data);
}
uint64_t Snapshot::get_sample_count() const
}
uint64_t Snapshot::get_sample_count() const
@@
-52,7
+50,7
@@
uint64_t Snapshot::get_sample_count() const
return _sample_count;
}
return _sample_count;
}
-int Snapshot::unit_size() const
+
unsigned
int Snapshot::unit_size() const
{
return _unit_size;
}
{
return _unit_size;
}
@@
-64,14
+62,14
@@
void Snapshot::set_capacity(const uint64_t new_capacity)
assert(_capacity >= _sample_count);
if (new_capacity > _capacity) {
_capacity = new_capacity;
assert(_capacity >= _sample_count);
if (new_capacity > _capacity) {
_capacity = new_capacity;
- _data
= realloc(_data,
(new_capacity * _unit_size) + sizeof(uint64_t));
+ _data
.resize(
(new_capacity * _unit_size) + sizeof(uint64_t));
}
}
uint64_t Snapshot::capacity() const
{
lock_guard<recursive_mutex> lock(_mutex);
}
}
uint64_t Snapshot::capacity() const
{
lock_guard<recursive_mutex> lock(_mutex);
- return _
capacity
;
+ return _
data.size()
;
}
void Snapshot::append_data(void *data, uint64_t samples)
}
void Snapshot::append_data(void *data, uint64_t samples)
@@
-86,7
+84,7
@@
void Snapshot::append_data(void *data, uint64_t samples)
set_capacity(_sample_count + samples);
}
set_capacity(_sample_count + samples);
}
- memcpy((uint8_t*)_data + _sample_count * _unit_size,
+ memcpy((uint8_t*)_data
.data()
+ _sample_count * _unit_size,
data, samples * _unit_size);
_sample_count += samples;
}
data, samples * _unit_size);
_sample_count += samples;
}