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/unix/clock_settime.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'sysdeps/unix/clock_settime.c') diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c index 069336a69e..6e1f487171 100644 --- a/sysdeps/unix/clock_settime.c +++ b/sysdeps/unix/clock_settime.c @@ -31,7 +31,7 @@ static hp_timing_t freq; /* This function is defined in the thread library. */ -extern void __pthread_clock_settime (hp_timing_t offset) +extern void __pthread_clock_settime (clockid_t clock_id, hp_timing_t offset) __attribute__ ((__weak__)); #endif @@ -69,9 +69,20 @@ clock_settime (clockid_t clock_id, const struct timespec *tp) break; #endif + default: +#if HP_TIMING_AVAIL + if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1)) + != CLOCK_THREAD_CPUTIME_ID) +#endif + { + __set_errno (EINVAL); + retval = -1; + break; + } + #if HP_TIMING_AVAIL + /* FALLTHROUGH. */ case CLOCK_PROCESS_CPUTIME_ID: - case CLOCK_THREAD_CPUTIME_ID: { hp_timing_t tsc; hp_timing_t usertime; @@ -98,21 +109,16 @@ clock_settime (clockid_t clock_id, const struct timespec *tp) usertime = tp->tv_sec * freq + (tp->tv_nsec * freq) / 1000000000ull; /* Determine the offset and use it as the new base value. */ - if (clock_id != CLOCK_THREAD_CPUTIME_ID + if (clock_id == CLOCK_PROCESS_CPUTIME_ID || __pthread_clock_settime == NULL) GL(dl_cpuclock_offset) = tsc - usertime; else - __pthread_clock_settime (tsc - usertime); + __pthread_clock_settime (clock_id, tsc - usertime); retval = 0; } break; #endif - - default: - __set_errno (EINVAL); - retval = -1; - break; } return retval; -- cgit v1.2.3