mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-29 18:08:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aux/util: use int64_t to represent timestamps in u_time

Browse source 
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2298>
This commit is contained in:
Simon Zeni 2024-08-01 14:58:06 -04:00 committed by Rylie Pavlik
parent 54fe2c0e4e
commit bc131e651a
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/xrt/auxiliary/util/u_time.cpp
View file

@ -39,7 +39,7 @@ struct time_state
*/
extern "C" struct time_state *
time_state_create(uint64_t offset)
time_state_create(int64_t offset)
{
time_state *state = new (std::nothrow) time_state;
if (!state) {
@ -84,7 +84,7 @@ time_state_to_timespec(struct time_state const *state, timepoint_ns timestamp, s
assert(state != NULL);
assert(out != NULL);
uint64_t ns = time_state_ts_to_monotonic_ns(state, timestamp);
int64_t ns = time_state_ts_to_monotonic_ns(state, timestamp);
out->tv_sec = ns / (U_1_000_000_000);
out->tv_nsec = ns % (U_1_000_000_000);
@ -96,7 +96,7 @@ time_state_from_timespec(struct time_state const *state, const struct timespec *
assert(state != NULL);
assert(timespecTime != NULL);
uint64_t ns = 0;
int64_t ns = 0;
ns += timespecTime->tv_nsec;
ns += timespecTime->tv_sec * U_1_000_000_000;
@ -104,14 +104,14 @@ time_state_from_timespec(struct time_state const *state, const struct timespec *
}
extern "C" timepoint_ns
time_state_monotonic_to_ts_ns(struct time_state const *state, uint64_t monotonic_ns)
time_state_monotonic_to_ts_ns(struct time_state const *state, int64_t monotonic_ns)
{
assert(state != NULL);
return monotonic_ns - state->offset;
}
extern "C" uint64_t
extern "C" int64_t
time_state_ts_to_monotonic_ns(struct time_state const *state, timepoint_ns timestamp)
{
assert(state != NULL);
@ -126,7 +126,7 @@ time_state_to_win32perfcounter(struct time_state const *state, timepoint_ns time
assert(state != NULL);
assert(out_qpc_ticks != NULL);
uint64_t ns = time_state_ts_to_monotonic_ns(state, timestamp);
int64_t ns = time_state_ts_to_monotonic_ns(state, timestamp);
out_qpc_ticks->QuadPart = ns / os_ns_per_qpc_tick_get();
}
@ -137,7 +137,7 @@ time_state_from_win32perfcounter(struct time_state const *state, const LARGE_INT
assert(state != NULL);
assert(qpc_ticks != NULL);
uint64_t ns = qpc_ticks->QuadPart * os_ns_per_qpc_tick_get();
int64_t ns = qpc_ticks->QuadPart * os_ns_per_qpc_tick_get();
return time_state_monotonic_to_ts_ns(state, ns);
}

16
src/xrt/auxiliary/util/u_time.h
View file

@ -136,10 +136,10 @@ time_ms_f_to_ns(double ms_f)
* @ingroup aux_util
*/
static inline bool
time_is_within_range_of_each_other(timepoint_ns a, timepoint_ns b, uint64_t range)
time_is_within_range_of_each_other(timepoint_ns a, timepoint_ns b, int64_t range)
{
int64_t t = (int64_t)a - (int64_t)b;
return (-(int64_t)range < t) && (t < (int64_t)range);
int64_t t = a - b;
return (-range < t) && (t < range);
}
/*!
@ -161,7 +161,7 @@ time_is_within_half_ms(timepoint_ns a, timepoint_ns b)
* @ingroup aux_util
*/
static inline bool
time_is_less_then_or_within_range(timepoint_ns a, timepoint_ns b, uint64_t range)
time_is_less_then_or_within_range(timepoint_ns a, timepoint_ns b, int64_t range)
{
return a < b || time_is_within_range_of_each_other(a, b, range);
}
@ -185,7 +185,7 @@ time_is_less_then_or_within_half_ms(timepoint_ns a, timepoint_ns b)
* @ingroup aux_util
*/
static inline bool
time_is_greater_then_or_within_range(timepoint_ns a, timepoint_ns b, uint64_t range)
time_is_greater_then_or_within_range(timepoint_ns a, timepoint_ns b, int64_t range)
{
return a > b || time_is_within_range_of_each_other(a, b, range);
}
@ -220,7 +220,7 @@ struct time_state;
* @ingroup aux_util
*/
struct time_state *
time_state_create(uint64_t offset);
time_state_create(int64_t offset);
/*!
@ -295,7 +295,7 @@ time_state_from_timespec(struct time_state const *state, const struct timespec *
* @ingroup aux_util
*/
timepoint_ns
time_state_monotonic_to_ts_ns(struct time_state const *state, uint64_t monotonic_ns);
time_state_monotonic_to_ts_ns(struct time_state const *state, int64_t monotonic_ns);
/*!
* Convert a adjusted integer timestamp to an monotonic system time (such as
@ -306,7 +306,7 @@ time_state_monotonic_to_ts_ns(struct time_state const *state, uint64_t monotonic
* @public @memberof time_state
* @ingroup aux_util
*/
uint64_t
int64_t
time_state_ts_to_monotonic_ns(struct time_state const *state, timepoint_ns timestamp);
#if defined(XRT_OS_WINDOWS) || defined(XRT_DOXYGEN)