aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-12-06 22:29:01 +0000
committerRoland McGrath <roland@gnu.org>2004-12-06 22:29:01 +0000
commit60fce589e8c4b177ee5025269987476826ab6b0f (patch)
treeea2607535f536f8a8ec0df8fac85847b4d16648a /sysdeps/unix
parentbc5cb1e6aaa5f50f7ec508c1f0c1d8a539da0fcd (diff)
downloadglibc-60fce589e8c4b177ee5025269987476826ab6b0f.tar
glibc-60fce589e8c4b177ee5025269987476826ab6b0f.tar.gz
glibc-60fce589e8c4b177ee5025269987476826ab6b0f.tar.bz2
glibc-60fce589e8c4b177ee5025269987476826ab6b0f.zip
* sysdeps/unix/clock_nanosleep.c (clock_nanosleep): Diagnose EINVAL
for CLOCK_THREAD_CPUTIME_ID, not ENOTSUP. Use SYSDEP_NANOSLEEP handler before validating CLOCK_ID value. * rt/tst-timer4.c (TEST_CLOCK, TEST_CLOCK_NANOSLEEP): New macros. Use them throughout in place of CLOCK_REALTIME and nanosleep. (do_test) [TEST_CLOCK_MISSING]: Call this macro and if it returns non-null, punt the test with a message using the string returned. * rt/tst-timer5.c: New file. * rt/Makefile (tests): Add it.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/clock_nanosleep.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sysdeps/unix/clock_nanosleep.c b/sysdeps/unix/clock_nanosleep.c
index 6b170fd702..248bfe1c96 100644
--- a/sysdeps/unix/clock_nanosleep.c
+++ b/sysdeps/unix/clock_nanosleep.c
@@ -1,5 +1,5 @@
/* High-resolution sleep with the specified clock.
- Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -49,16 +49,19 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
|| __builtin_expect (req->tv_nsec, 0) >= 1000000000)
return EINVAL;
+ if (clock_id == CLOCK_THREAD_CPUTIME_ID)
+ return EINVAL; /* POSIX specifies EINVAL for this case. */
+
+#ifdef SYSDEP_NANOSLEEP
+ SYSDEP_NANOSLEEP;
+#endif
+
if (CPUCLOCK_P (clock_id))
return ENOTSUP;
if (INVALID_CLOCK_P (clock_id))
return EINVAL;
-#ifdef SYSDEP_NANOSLEEP
- SYSDEP_NANOSLEEP;
-#endif
-
/* If we got an absolute time, remap it. */
if (flags == TIMER_ABSTIME)
{