diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-02-14 01:12:02 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-02-14 01:12:02 +0000 |
| commit | a1ea4c0638ecf4ef3c421b03089000aca7d0f0eb (patch) | |
| tree | 6ecd88fb4921750225d856d4f425b81e06986d3f /nptl/sysdeps | |
| parent | e8cda341a4e8893a5932a0d22440e7c191c37564 (diff) | |
Update.
* tst-cond7.c (do_test): Unlock the mutex before canceling the thread.
* sysdeps/pthread/pthread.h: Add missing initializers. Protect
non-standard initializers with __USE_GNU.
Diffstat (limited to 'nptl/sysdeps')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 37 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S | 3 |
2 files changed, 24 insertions, 16 deletions
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index aeb3ef520e..135b255a53 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003 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 @@ -38,20 +38,7 @@ enum }; -/* Mutex handling. */ - -#define PTHREAD_MUTEX_INITIALIZER \ - { } - -#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ - { .__data = { .__kind = PTHREAD_MUTEX_RECURSIVE_NP } } - -#define PTHREAD_RWLOCK_INITIALIZER \ - { } - -#define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ - { .__data = { .__flags = PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } } - +/* Mutex types. */ enum { PTHREAD_MUTEX_TIMED_NP, @@ -71,6 +58,18 @@ enum #endif }; +/* Mutex initializers. */ +#define PTHREAD_MUTEX_INITIALIZER \ + { } +#ifdef __USE_GNU +# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ + { .__data = { .__kind = PTHREAD_MUTEX_RECURSIVE_NP } } +# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \ + { .__data = { .__kind = PTHREAD_MUTEX_ERRORCHECK_NP } } +# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \ + { .__data = { .__kind = PTHREAD_MUTEX_ADAPTIVE_NP } } +#endif + /* Read-write lock types. */ #ifdef __USE_UNIX98 @@ -83,6 +82,14 @@ enum }; #endif /* Unix98 */ +/* Read-write lock initializers. */ +#define PTHREAD_RWLOCK_INITIALIZER \ + { } +#ifdef __USE_GNU +# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ + { .__data = { .__flags = PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } } +#endif + /* Scheduler inheritance. */ enum diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S index b2a5d53e31..fffef03bd5 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -65,7 +65,8 @@ __pthread_cond_broadcast: cmpl (%ebx), %ecx jna 4f - /* Case all currently waiting threads to wake up. */ + /* Cause all currently waiting threads to recognize they are + woken up. */ 3: movl %ecx, (%ebx) movl %eax, 4(%ebx) |