[master] 20c74f723 deautocrap: Everybody have clock_gettime(2)
Poul-Henning Kamp
phk at FreeBSD.org
Fri May 3 14:15:09 UTC 2024
commit 20c74f72344c0f87a07242f9d645a1c6af1ebc3f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Fri May 3 13:24:48 2024 +0000
deautocrap: Everybody have clock_gettime(2)
diff --git a/configure.ac b/configure.ac
index 23f5f3b6a..e52189329 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,6 @@ _VARNISH_CHECK_PYTHON
# Check for libraries.
_VARNISH_SEARCH_LIBS(pthread, pthread_create, [thr pthread c_r])
-_VARNISH_CHECK_LIB(rt, clock_gettime)
_VARNISH_CHECK_LIB(dl, dlopen)
_VARNISH_CHECK_LIB(socket, socket)
_VARNISH_CHECK_LIB(nsl, getaddrinfo)
diff --git a/lib/libvarnish/vtim.c b/lib/libvarnish/vtim.c
index 05557efab..6e61ff393 100644
--- a/lib/libvarnish/vtim.c
+++ b/lib/libvarnish/vtim.c
@@ -130,19 +130,13 @@ init(void)
vtim_mono
VTIM_mono(void)
{
-#if defined(HAVE_CLOCK_GETTIME) && !defined(USE_GETHRTIME)
+#if defined(HAVE_GETHRTIME) && defined(USE_GETHRTIME)
+ return (gethrtime() * 1e-9);
+#else
struct timespec ts;
AZ(clock_gettime(CLOCK_MONOTONIC, &ts));
return (ts.tv_sec + 1e-9 * ts.tv_nsec);
-#elif defined(HAVE_GETHRTIME)
- return (gethrtime() * 1e-9);
-#elif defined(__MACH__)
- uint64_t mt = mach_absolute_time() - mt_base;
-
- return (mt * mt_scale);
-#else
-#error Varnish needs some monotonic time source
#endif
}
More information about the varnish-commit
mailing list