cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

time: ensure type correctness and calculate nsec correctly (#13167)

Browse source 
use auto for nsecdur, assigning system_tp into steady_tp compiles but is
not correct. just change it to auto.

use {} initialization for timespec structs and returning std::pair.

in timediff, fromTimespec and toTimespec the else case was calculating
wrong. we need to correctly handle the borrow when the nanoseconds of
the first time are smaller than the second, by adding TIMESPEC_NSEC_PER_SEC
and decrementing the seconds.
This commit is contained in:
Tom Englund 2026-02-01 15:18:06 +01:00 • committed by GitHub
parent db6114c6c5
commit 47f9035601
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/helpers/time/Time.cpp
View file

@ -5,7 +5,6 @@
using s_ns = std::pair<uint64_t, uint64_t>;
// HAS to be a > b
static s_ns timediff(const s_ns& a, const s_ns& b) {
s_ns d;
@ -13,7 +12,7 @@ static s_ns timediff(const s_ns& a, const s_ns& b) {
if (a.second >= b.second)
d.second = a.second - b.second;
else {
d.second = b.second - a.second;
d.second = (TIMESPEC_NSEC_PER_SEC + a.second) - b.second;
d.first -= 1;
}
@ -46,9 +45,9 @@ uint64_t Time::millis(const steady_tp& tp) {
}
s_ns Time::secNsec(const steady_tp& tp) {
const uint64_t sec = chr::duration_cast<chr::seconds>(tp.time_since_epoch()).count();
const chr::steady_clock::duration nsecdur = tp - chr::steady_clock::time_point(chr::seconds(sec));
return std::make_pair<>(sec, chr::duration_cast<chr::nanoseconds>(nsecdur).count());
const uint64_t sec = chr::duration_cast<chr::seconds>(tp.time_since_epoch()).count();
const auto nsecdur = tp - chr::steady_clock::time_point(chr::seconds(sec));
return {sec, chr::duration_cast<chr::nanoseconds>(nsecdur).count()};
}
uint64_t Time::millis(const system_tp& tp) {
@ -56,9 +55,9 @@ uint64_t Time::millis(const system_tp& tp) {
}
s_ns Time::secNsec(const system_tp& tp) {
const uint64_t sec = chr::duration_cast<chr::seconds>(tp.time_since_epoch()).count();
const chr::steady_clock::duration nsecdur = tp - chr::system_clock::time_point(chr::seconds(sec));
return std::make_pair<>(sec, chr::duration_cast<chr::nanoseconds>(nsecdur).count());
const uint64_t sec = chr::duration_cast<chr::seconds>(tp.time_since_epoch()).count();
const auto nsecdur = tp - chr::system_clock::time_point(chr::seconds(sec));
return {sec, chr::duration_cast<chr::nanoseconds>(nsecdur).count()};
}
// TODO: this is a mess, but C++ doesn't define what steady_clock is.
@ -69,12 +68,12 @@ s_ns Time::secNsec(const system_tp& tp) {
// In general, this may shift the time around by a couple hundred ns. Doesn't matter, realistically.
Time::steady_tp Time::fromTimespec(const timespec* ts) {
struct timespec mono, real;
timespec mono{}, real{};
clock_gettime(CLOCK_MONOTONIC, &mono);
clock_gettime(CLOCK_REALTIME, &real);
Time::steady_tp now = Time::steadyNow();
Time::system_tp nowSys = Time::systemNow();
s_ns stdSteady, stdReal;
auto now = Time::steadyNow();
auto nowSys = Time::systemNow();
s_ns stdSteady, stdReal;
stdSteady = Time::secNsec(now);
stdReal = Time::secNsec(nowSys);
@ -84,7 +83,7 @@ Time::steady_tp Time::fromTimespec(const timespec* ts) {
if (real.tv_nsec >= mono.tv_nsec)
diff.second = real.tv_nsec - mono.tv_nsec;
else {
diff.second = mono.tv_nsec - real.tv_nsec;
diff.second = TIMESPEC_NSEC_PER_SEC + real.tv_nsec - mono.tv_nsec;
diff.first -= 1;
}
@ -119,7 +118,7 @@ struct timespec Time::toTimespec(const steady_tp& tp) {
if (real.tv_nsec >= mono.tv_nsec)
diff.second = real.tv_nsec - mono.tv_nsec;
else {
diff.second = mono.tv_nsec - real.tv_nsec;
diff.second = TIMESPEC_NSEC_PER_SEC + real.tv_nsec - mono.tv_nsec;
diff.first -= 1;
}