Skip to content

Avoid noexcept error when using time_point with atomic #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ljbade merged 1 commit into from
Apr 13, 2022
Merged

Avoid noexcept error when using time_point with atomic #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/include/prometheus/gauge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ class PROMETHEUS_CPP_CORE_EXPORT Gauge {
private:
void Change(double);
std::atomic<double> value_{0.0};
std::atomic<std::chrono::system_clock::time_point> time_{
std::chrono::system_clock::now()};
std::atomic<std::chrono::system_clock::duration> time_{
std::chrono::system_clock::now().time_since_epoch()};
};

/// \brief Return a builder to configure and register a Gauge metric.
Expand Down
8 changes: 4 additions & 4 deletions core/src/gauge.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void Gauge::Decrement(const double value) { Change(-1.0 * value); }

void Gauge::Set(const double value) {
value_.store(value);
time_.store(std::chrono::system_clock::now());
time_.store(std::chrono::system_clock::now().time_since_epoch());
}

void Gauge::Change(const double value) {
Expand All @@ -25,7 +25,7 @@ void Gauge::Change(const double value) {
while (!value_.compare_exchange_weak(current, current + value)) {
// intentionally empty block
}
time_.store(std::chrono::system_clock::now());
time_.store(std::chrono::system_clock::now().time_since_epoch());
}

void Gauge::SetToCurrentTime() {
Expand All @@ -43,8 +43,8 @@ ClientMetric Gauge::Collect() const {

bool Gauge::Expired(const std::chrono::system_clock::time_point& time,
const std::chrono::seconds& ttl) const {
return std::chrono::duration_cast<std::chrono::seconds>(time -
time_.load()) >= ttl;
return std::chrono::duration_cast<std::chrono::seconds>(
time.time_since_epoch() - time_.load()) >= ttl;
}

} // namespace prometheus