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/sysdeps/pthread | |
| 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/sysdeps/pthread')
| -rw-r--r-- | linuxthreads/sysdeps/pthread/getcpuclockid.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/linuxthreads/sysdeps/pthread/getcpuclockid.c b/linuxthreads/sysdeps/pthread/getcpuclockid.c index fff1cb03ec..032caeb081 100644 --- a/linuxthreads/sysdeps/pthread/getcpuclockid.c +++ b/linuxthreads/sysdeps/pthread/getcpuclockid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 2000, 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 @@ -19,18 +19,27 @@ #include <errno.h> #include <pthread.h> #include <sys/time.h> +#include <time.h> #include <internals.h> int pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id) { - /* We don't allow any process ID but our own. */ - if (thread_handle (thread_id)->h_descr != thread_self ()) - return EPERM; - #ifdef CLOCK_THREAD_CPUTIME_ID + /* We need to store the thread ID in the CLOCKID variable together + with a number identifying the clock. We reserve the low 3 bits + for the clock ID and the rest for the thread ID. This is + problematic if the thread ID is too large. But 29 bits should be + fine. + + If some day more clock IDs are needed the ID part can be + enlarged. The IDs are entirely internal. */ + if (2 * PTHREAD_THREADS_MAX + >= 1 << (8 * sizeof (*clock_id) - CLOCK_IDFIELD_SIZE)) + return ERANGE; + /* Store the number. */ - *clock_id = CLOCK_THREAD_CPUTIME_ID; + *clock_id = CLOCK_THREAD_CPUTIME_ID | (thread_id << CLOCK_IDFIELD_SIZE); return 0; #else |