diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-09-02 18:59:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-09-02 18:59:24 +0000 |
| commit | 73f7c32c47ab2397935d9fc2aeaa594794b38c7e (patch) | |
| tree | 1a0f7d20c9009fbd67c33495f9db0a5d665092b3 /nptl/pthread_condattr_setclock.c | |
| parent | 86aca5ac58e152336e676bc1231acac6adc32068 (diff) | |
| download | glibc-73f7c32c47ab2397935d9fc2aeaa594794b38c7e.tar.gz glibc-73f7c32c47ab2397935d9fc2aeaa594794b38c7e.tar.xz glibc-73f7c32c47ab2397935d9fc2aeaa594794b38c7e.zip | |
[BZ #357]
Update. 2004-09-02 Steven Munroe <sjmunroe@us.ibm.com> [BZ #357] * stdlib/tst-setcontext.c (test_stack): Added test for stack clobber. (main): Call test_stack. * sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S (__getcontext): Push stack frame then save parms in local frame. Improve instruction scheduling. * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S (__swapcontext): Likewise.
Diffstat (limited to 'nptl/pthread_condattr_setclock.c')
| -rw-r--r-- | nptl/pthread_condattr_setclock.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nptl/pthread_condattr_setclock.c b/nptl/pthread_condattr_setclock.c index 0f1829c502..04e246b74d 100644 --- a/nptl/pthread_condattr_setclock.c +++ b/nptl/pthread_condattr_setclock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. @@ -17,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <assert.h> #include <errno.h> #include <stdbool.h> #include <time.h> @@ -45,8 +46,7 @@ pthread_condattr_setclock (attr, clock_id) INTERNAL_SYSCALL_DECL (err); int val; - val = INTERNAL_SYSCALL (clock_getres, err, 2, CLOCK_MONOTONIC, - &ts); + val = INTERNAL_SYSCALL (clock_getres, err, 2, CLOCK_MONOTONIC, &ts); avail = INTERNAL_SYSCALL_ERROR_P (val, err) ? -1 : 1; } @@ -57,11 +57,16 @@ pthread_condattr_setclock (attr, clock_id) #endif } else if (clock_id != CLOCK_REALTIME) + /* If more clocks are allowed some day the storing of the clock ID + in the pthread_cond_t structure needs to be adjusted. */ return EINVAL; + /* Make sure the value fits in the bits we reserved. */ + assert (clock_id < (1 << COND_CLOCK_BITS)); + int *valuep = &((struct pthread_condattr *) attr)->value; - *valuep = (*valuep & ~0xfe) | (clock_id << 1); + *valuep = (*valuep & ~(1 << (COND_CLOCK_BITS + 1)) & ~1) | (clock_id << 1); return 0; } |