X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Ftime%2Fclock_gettime.c;h=8fd1b8f58ae2e156a0995aa3b3613ea72521e3f8;hb=5b74eed3b301e2227385f3bf26d3bb7c2d822cf8;hp=bb977e28a4050b761a0d08d8978f730f6b3f6f6a;hpb=f7adc39e3793114e989f0a830af966230cd2c83d;p=musl

diff --git a/src/time/clock_gettime.c b/src/time/clock_gettime.c
index bb977e28..8fd1b8f5 100644
--- a/src/time/clock_gettime.c
+++ b/src/time/clock_gettime.c
@@ -2,27 +2,54 @@
 #include <errno.h>
 #include <stdint.h>
 #include "syscall.h"
-#include "libc.h"
+#include "atomic.h"
 
-int __vdso_clock_gettime(clockid_t, struct timespec *) __attribute__((weak));
-static int (*const cgt)(clockid_t, struct timespec *) = __vdso_clock_gettime;
+#ifdef VDSO_CGT_SYM
+
+static void *volatile vdso_func;
+
+static int cgt_init(clockid_t clk, struct timespec *ts)
+{
+	void *p = __vdsosym(VDSO_CGT_VER, VDSO_CGT_SYM);
+	int (*f)(clockid_t, struct timespec *) =
+		(int (*)(clockid_t, struct timespec *))p;
+	a_cas_p(&vdso_func, (void *)cgt_init, p);
+	return f ? f(clk, ts) : -ENOSYS;
+}
+
+static void *volatile vdso_func = (void *)cgt_init;
+
+#endif
 
 int __clock_gettime(clockid_t clk, struct timespec *ts)
 {
 	int r;
-	if (cgt) return cgt(clk, ts);
+
+#ifdef VDSO_CGT_SYM
+	int (*f)(clockid_t, struct timespec *) =
+		(int (*)(clockid_t, struct timespec *))vdso_func;
+	if (f) {
+		r = f(clk, ts);
+		if (!r) return r;
+		if (r == -EINVAL) return __syscall_ret(r);
+		/* Fall through on errors other than EINVAL. Some buggy
+		 * vdso implementations return ENOSYS for clocks they
+		 * can't handle, rather than making the syscall. This
+		 * also handles the case where cgt_init fails to find
+		 * a vdso function to use. */
+	}
+#endif
+
 	r = __syscall(SYS_clock_gettime, clk, ts);
-	if (!r) return r;
 	if (r == -ENOSYS) {
 		if (clk == CLOCK_REALTIME) {
-			__syscall(SYS_gettimeofday, clk, ts, 0);
+			__syscall(SYS_gettimeofday, ts, 0);
 			ts->tv_nsec = (int)ts->tv_nsec * 1000;
 			return 0;
 		}
 		r = -EINVAL;
 	}
-	errno = -r;
-	return -1;
+	return __syscall_ret(r);
 }
 
 weak_alias(__clock_gettime, clock_gettime);