diff options
| author | Rich Felker <dalias@aerifal.cx> | 2019-07-21 01:53:14 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2019-07-27 02:46:57 -0400 |
| commit | 331993e3fc3623f111d95796d3d7f30b4f6552c1 (patch) | |
| tree | e17e0f0717b1f2ac3e49491d171934e5056566b7 /src | |
| parent | 0ce49d0a301b4142741b32773492af90f66ed3ca (diff) | |
| download | musl-331993e3fc3623f111d95796d3d7f30b4f6552c1.tar.gz | |
refactor thrd_sleep and nanosleep in terms of clock_nanosleep
for namespace-safety with thrd_sleep, this requires an alias, which is
also added. this eliminates all but one direct call point for
nanosleep syscalls, and arranges that 64-bit time_t conversion logic
will only need to exist in one file rather than three.
as a bonus, clock_nanosleep with CLOCK_REALTIME and empty flags is now
implemented as SYS_nanosleep, thereby working on older kernels that
may lack POSIX clocks functionality.
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/time.h | 1 | ||||
| -rw-r--r-- | src/thread/thrd_sleep.c | 3 | ||||
| -rw-r--r-- | src/time/clock_nanosleep.c | 10 | ||||
| -rw-r--r-- | src/time/nanosleep.c | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/src/include/time.h b/src/include/time.h index 24c87973..cbabde47 100644 --- a/src/include/time.h +++ b/src/include/time.h @@ -4,6 +4,7 @@ #include "../../include/time.h" hidden int __clock_gettime(clockid_t, struct timespec *); +hidden int __clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *); hidden char *__asctime_r(const struct tm *, char *); hidden struct tm *__gmtime_r(const time_t *restrict, struct tm *restrict); diff --git a/src/thread/thrd_sleep.c b/src/thread/thrd_sleep.c index e8dfe400..97de5345 100644 --- a/src/thread/thrd_sleep.c +++ b/src/thread/thrd_sleep.c @@ -1,10 +1,11 @@ #include <threads.h> +#include <time.h> #include <errno.h> #include "syscall.h" int thrd_sleep(const struct timespec *req, struct timespec *rem) { - int ret = __syscall(SYS_nanosleep, req, rem); + int ret = -__clock_nanosleep(CLOCK_REALTIME, 0, req, rem); switch (ret) { case 0: return 0; case -EINTR: return -1; /* value specified by C11 */ diff --git a/src/time/clock_nanosleep.c b/src/time/clock_nanosleep.c index 32f0c07e..1174f510 100644 --- a/src/time/clock_nanosleep.c +++ b/src/time/clock_nanosleep.c @@ -2,8 +2,12 @@ #include <errno.h> #include "syscall.h" -int clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct timespec *rem) +int __clock_nanosleep(clockid_t clk, int flags, const struct timespec *req, struct timespec *rem) { - int r = -__syscall_cp(SYS_clock_nanosleep, clk, flags, req, rem); - return clk == CLOCK_THREAD_CPUTIME_ID ? EINVAL : r; + if (clk == CLOCK_THREAD_CPUTIME_ID) return EINVAL; + if (clk == CLOCK_REALTIME && !flags) + return -__syscall_cp(SYS_nanosleep, req, rem); + return -__syscall_cp(SYS_clock_nanosleep, clk, flags, req, rem); } + +weak_alias(__clock_nanosleep, clock_nanosleep); diff --git a/src/time/nanosleep.c b/src/time/nanosleep.c index 1e6f3922..bc9f7895 100644 --- a/src/time/nanosleep.c +++ b/src/time/nanosleep.c @@ -3,5 +3,5 @@ int nanosleep(const struct timespec *req, struct timespec *rem) { - return syscall_cp(SYS_nanosleep, req, rem); + return __syscall_ret(-__clock_nanosleep(CLOCK_REALTIME, 0, req, rem)); } |