From 4165d44d7026bb2572d4cdfe27f8fec348b4089a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 25 Jun 2003 00:00:50 +0000 Subject: Update. * include/time.h: Define CLOCK_IDFIELD_SIZE. * sysdeps/posix/clock_getres.c: Recognize thread CPU clock IDs. * sysdeps/unix/clock_gettime.c: Likewise. * sysdeps/unix/clock_settime.c: Likewise. * sysdeps/unix/clock_nanosleep.c (CPUCLOCK_P): Adjust for new clock id for thread CPU clocks. --- sysdeps/posix/clock_getres.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'sysdeps/posix') diff --git a/sysdeps/posix/clock_getres.c b/sysdeps/posix/clock_getres.c index 91c57629ca..a2d466607e 100644 --- a/sysdeps/posix/clock_getres.c +++ b/sysdeps/posix/clock_getres.c @@ -64,9 +64,19 @@ clock_getres (clockid_t clock_id, struct timespec *res) break; #endif /* handled REALTIME */ + default: +#if HP_TIMING_AVAIL + if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1)) + != CLOCK_THREAD_CPUTIME_ID) +#endif + { + __set_errno (EINVAL); + break; + } + #if HP_TIMING_AVAIL && !defined HANDLED_CPUTIME + /* FALLTHROUGH. */ case CLOCK_PROCESS_CPUTIME_ID: - case CLOCK_THREAD_CPUTIME_ID: { if (__builtin_expect (nsec == 0, 0)) { @@ -93,10 +103,6 @@ clock_getres (clockid_t clock_id, struct timespec *res) } break; #endif - - default: - __set_errno (EINVAL); - break; } return retval; -- cgit 1.4.1