diff --git a/changes/feature24427 b/changes/feature24427 new file mode 100644 index 0000000000000000000000000000000000000000..8650c45d31a2b2e7d21c400b1268a02ba5567a7b --- /dev/null +++ b/changes/feature24427 @@ -0,0 +1,5 @@ + o Minor features (OSX, iOS, performance): + - Use the mach_approximate_time() function (when available) to + implement coarse monotonic time. Having a coarse time function + should avoid a large number of system calls, and improve + performance slightly, especially under load. Closes ticket 24427. diff --git a/configure.ac b/configure.ac index 0b3e1dda26cf034247a8ae70c51bb4aee792ef00..84ae9090b811bb77d221b791046e78d0fec4e21b 100644 --- a/configure.ac +++ b/configure.ac @@ -506,6 +506,7 @@ AC_CHECK_FUNCS( llround \ localtime_r \ lround \ + mach_approximate_time \ memmem \ memset_s \ pipe \ diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 204b8d7d1554868a4f8ae7972411bd0d925adcf4..c0cd73c74d84ad9ac01850f24d8af4479fab4361 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -314,6 +314,21 @@ monotime_get(monotime_t *out) out->abstime_ = mach_absolute_time(); } +#if defined(HAVE_MACH_APPROXIMATE_TIME) +void +monotime_coarse_get(monotime_coarse_t *out) +{ +#ifdef TOR_UNIT_TESTS + if (monotime_mocking_enabled) { + out->abstime_ = (mock_time_nsec_coarse * mach_time_info.denom) + / mach_time_info.numer; + return; + } +#endif /* defined(TOR_UNIT_TESTS) */ + out->abstime_ = mach_approximate_time(); +} +#endif + /** * Return the number of nanoseconds between <b>start</b> and <b>end</b>. */ diff --git a/src/common/compat_time.h b/src/common/compat_time.h index 462dcecceac94ef52904670bb9efbd136de298d4..bcf469e2707ddcb36f9341f3a37ac54c500b98f9 100644 --- a/src/common/compat_time.h +++ b/src/common/compat_time.h @@ -65,6 +65,9 @@ typedef struct monotime_t { typedef struct monotime_coarse_t { uint64_t tick_count_; } monotime_coarse_t; +#elif defined(__APPLE__) && defined(HAVE_MACH_APPROXIMATE_TIME) +#define MONOTIME_COARSE_FN_IS_DIFFERENT +#define monotime_coarse_t monotime_t #else #define monotime_coarse_t monotime_t #endif /* defined(CLOCK_MONOTONIC_COARSE) && ... || ... */