projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: document the purpose of sampling_mutex_.
[pulseview.git]
/
pv
/
data
/
segment.cpp
diff --git
a/pv/data/segment.cpp
b/pv/data/segment.cpp
index 111b62b71aadf0c43189540050c55e92de29dc43..831c0acaac49cf68fd428ce7ef57fabc6f8a4576 100644
(file)
--- a/
pv/data/segment.cpp
+++ b/
pv/data/segment.cpp
@@
-52,7
+52,7
@@
uint64_t Segment::get_sample_count() const
return sample_count_;
}
return sample_count_;
}
-
double
Segment::start_time() const
+
const pv::util::Timestamp&
Segment::start_time() const
{
return start_time_;
}
{
return start_time_;
}
@@
-78,8
+78,9
@@
void Segment::set_capacity(const uint64_t new_capacity)
assert(capacity_ >= sample_count_);
if (new_capacity > capacity_) {
assert(capacity_ >= sample_count_);
if (new_capacity > capacity_) {
- capacity_ = new_capacity;
+ // If we're out of memory, this will throw std::bad_alloc
data_.resize((new_capacity * unit_size_) + sizeof(uint64_t));
data_.resize((new_capacity * unit_size_) + sizeof(uint64_t));
+ capacity_ = new_capacity;
}
}
}
}