diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-07-08 23:55:54 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-07-08 23:55:54 +0000 |
| commit | 1b8cbd0847c4cbd319a8b3b706269a401940e2c4 (patch) | |
| tree | 3b453cb554b8926e65fd254a5c3462e7964b8b92 /linuxthreads/ptclock_gettime.c | |
| parent | ece385dbb8601ce09ac1762c9df7b8e37220794b (diff) | |
Update.
2004-07-07 Jakub Jelinek <jakub@redhat.com>
* sysdeps/pthread/getcpuclockid.c (pthread_getcpuclockid): Allow
using other thread's clock.
* ptclock_gettime.c (__pthread_clock_gettime): Likewise.
* ptclock_settime.c (__pthread_clock_settime): Likewise.
* internals.h (__pthread_clock_gettime, __pthread_clock_settime):
Remove prototypes.
Reported by Bernd Schmidt <bernds@redhat.com>.
* Makefile (librt-tests): Add tst-clock1.
* tst-clock1.c: New test.
* sysdeps/x86_64/Versions: New file.
* sysdeps/unix/sysv/linux/ia64/bits/posix_opt.h: New file.
* sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h: New file.
Diffstat (limited to 'linuxthreads/ptclock_gettime.c')
| -rw-r--r-- | linuxthreads/ptclock_gettime.c | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/linuxthreads/ptclock_gettime.c b/linuxthreads/ptclock_gettime.c index 8f17136e5e..755f83d101 100644 --- a/linuxthreads/ptclock_gettime.c +++ b/linuxthreads/ptclock_gettime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001, 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 @@ -16,23 +16,46 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> #include <time.h> #include <libc-internal.h> #include "internals.h" +#include "spinlock.h" #if HP_TIMING_AVAIL int -__pthread_clock_gettime (hp_timing_t freq, struct timespec *tp) +__pthread_clock_gettime (clockid_t clock_id, hp_timing_t freq, + struct timespec *tp) { - hp_timing_t tsc; + hp_timing_t tsc, cpuclock_offset; pthread_descr self = thread_self (); + pthread_t thread = ((unsigned int) clock_id) >> CLOCK_IDFIELD_SIZE; + const unsigned int mask = ~0U >> CLOCK_IDFIELD_SIZE; + + if (thread == 0 || (THREAD_GETMEM (self, p_tid) & mask) == thread) + cpuclock_offset = THREAD_GETMEM (self, p_cpuclock_offset); + else + { + pthread_descr th; + pthread_handle handle = thread_handle (thread); + __pthread_lock (&handle->h_lock, NULL); + th = handle->h_descr; + if (th == NULL || (th->p_tid & mask) != thread || th->p_terminated) + { + __pthread_unlock (&handle->h_lock); + __set_errno (EINVAL); + return -1; + } + cpuclock_offset = th->p_cpuclock_offset; + __pthread_unlock (&handle->h_lock); + } /* Get the current counter. */ HP_TIMING_NOW (tsc); /* Compute the offset since the start time of the process. */ - tsc -= THREAD_GETMEM (self, p_cpuclock_offset); + tsc -= cpuclock_offset; /* Compute the seconds. */ tp->tv_sec = tsc / freq; |