diff options
author | Pauli <pauli@openssl.org> | 2022-08-29 13:41:26 +1000 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2022-09-13 21:13:22 +1000 |
commit | 364c3b7b1ac3172dbe2108be23ae215b86ef8e08 (patch) | |
tree | d2d87ae42bd6733fe634ebff37be069277022922 /include | |
parent | ee68d2b957923e2e4d1d76d7ad66e0e8b3674d71 (diff) | |
download | openssl-new-364c3b7b1ac3172dbe2108be23ae215b86ef8e08.tar.gz |
time: add some additional utilities and document everything
Some of the recently added functions were not documents. This has been addressed.
Also added utility functions for conversions between time_t, seconds and struct timeval
to/from OSSL_TIME.
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19082)
Diffstat (limited to 'include')
-rw-r--r-- | include/internal/time.h | 62 |
1 files changed, 53 insertions, 9 deletions
diff --git a/include/internal/time.h b/include/internal/time.h index f5c56b6c7b..3039327d58 100644 --- a/include/internal/time.h +++ b/include/internal/time.h @@ -35,8 +35,16 @@ typedef struct { /* One microsecond. */ # define OSSL_TIME_US (OSSL_TIME_MS / 1000) +#define ossl_seconds2time(s) ossl_ticks2time((s) * OSSL_TIME_SECOND) +#define ossl_time2seconds(t) (ossl_time2ticks(t) / OSSL_TIME_SECOND) +#define ossl_ms2time(ms) ossl_ticks2time((ms) * OSSL_TIME_MS) +#define ossl_time2ms(t) (ossl_time2ticks(t) / OSSL_TIME_MS) +#define ossl_us2time(us) ossl_ticks2time((us) * OSSL_TIME_US) +#define ossl_time2us(t) (ossl_time2ticks(t) / OSSL_TIME_US) + /* Convert a tick count into a time */ -static ossl_unused ossl_inline OSSL_TIME ossl_ticks2time(uint64_t ticks) +static ossl_unused ossl_inline +OSSL_TIME ossl_ticks2time(uint64_t ticks) { OSSL_TIME r; @@ -45,7 +53,8 @@ static ossl_unused ossl_inline OSSL_TIME ossl_ticks2time(uint64_t ticks) } /* Convert a time to a tick count */ -static ossl_unused ossl_inline uint64_t ossl_time2ticks(OSSL_TIME t) +static ossl_unused ossl_inline +uint64_t ossl_time2ticks(OSSL_TIME t) { return t.t; } @@ -54,12 +63,14 @@ static ossl_unused ossl_inline uint64_t ossl_time2ticks(OSSL_TIME t) OSSL_TIME ossl_time_now(void); /* The beginning and end of the time range */ -static ossl_unused ossl_inline OSSL_TIME ossl_time_zero(void) +static ossl_unused ossl_inline +OSSL_TIME ossl_time_zero(void) { return ossl_ticks2time(0); } -static ossl_unused ossl_inline OSSL_TIME ossl_time_infinite(void) +static ossl_unused ossl_inline +OSSL_TIME ossl_time_infinite(void) { return ossl_ticks2time(~(uint64_t)0); } @@ -67,18 +78,41 @@ static ossl_unused ossl_inline OSSL_TIME ossl_time_infinite(void) /* Convert time to timeval */ static ossl_unused ossl_inline -void ossl_time_time_to_timeval(OSSL_TIME t, struct timeval *out) +struct timeval ossl_time_to_timeval(OSSL_TIME t) { + struct timeval tv; + #ifdef _WIN32 - out->tv_sec = (long int)(t.t / OSSL_TIME_SECOND); + tv.tv_sec = (long int)(t.t / OSSL_TIME_SECOND); #else - out->tv_sec = (time_t)(t.t / OSSL_TIME_SECOND); + tv.tv_sec = (time_t)(t.t / OSSL_TIME_SECOND); #endif - out->tv_usec = (t.t % OSSL_TIME_SECOND) / (OSSL_TIME_SECOND / 1000000); + tv.tv_usec = (t.t % OSSL_TIME_SECOND) / OSSL_TIME_US; + return tv; +} + +/* Convert timeval to time */ +static ossl_unused ossl_inline +OSSL_TIME ossl_time_from_timeval(struct timeval tv) +{ + OSSL_TIME t; + + if (tv.tv_sec < 0) + return ossl_time_zero(); + t.t = tv.tv_sec * OSSL_TIME_SECOND + tv.tv_usec * OSSL_TIME_US; + return t; +} + +/* Convert OSSL_TIME to time_t */ +static ossl_unused ossl_inline +time_t ossl_time_to_time_t(OSSL_TIME t) +{ + return (time_t)(t.t / OSSL_TIME_SECOND); } /* Convert time_t to OSSL_TIME */ -static ossl_inline OSSL_TIME ossl_time_from_time_t(time_t t) +static ossl_unused ossl_inline +OSSL_TIME ossl_time_from_time_t(time_t t) { OSSL_TIME ot; @@ -167,6 +201,16 @@ OSSL_TIME ossl_time_divide(OSSL_TIME a, uint64_t b) return err ? ossl_time_zero() : r; } +static ossl_unused ossl_inline +OSSL_TIME ossl_time_muldiv(OSSL_TIME a, uint64_t b, uint64_t c) +{ + OSSL_TIME r; + int err = 0; + + r.t = safe_muldiv_time(a.t, b, c, &err); + return err ? ossl_time_zero() : r; +} + /* Return higher of the two given time values. */ static ossl_unused ossl_inline OSSL_TIME ossl_time_max(OSSL_TIME a, OSSL_TIME b) |