diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-11-30 14:21:53 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-11-30 14:21:53 +0000 |
commit | 348ed5157bb4b6ef0e38f18ab8fd8d9910544e6e (patch) | |
tree | 8292846db47f486376760bcbf5f3dc6ef9a260a9 /malloc/thread-m.h | |
parent | 3f7b3d9b1f5fe48edeaa532355a7fb04a1836fa2 (diff) | |
download | glibc-348ed5157bb4b6ef0e38f18ab8fd8d9910544e6e.zip glibc-348ed5157bb4b6ef0e38f18ab8fd8d9910544e6e.tar.gz glibc-348ed5157bb4b6ef0e38f18ab8fd8d9910544e6e.tar.bz2 |
Update.
1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nscd/nscd_getpw_r.c: Include nscd_proto.h for prototypes.
* sysdeps/generic/errno-loc.c: Include <errno.h> for prototype,
undefine errno to get variable.
* sysdeps/unix/sysv/linux/i386/setfsuid.c: Include <sys/fsuid.h>
instead of <unistd.h> for prototype.
* sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise.
1998-11-30 Ulrich Drepper <drepper@cygnus.com>
* misc/err.h: Correct comments and use protected attribute keywords.
Reported by Joseph Myers <jsm28@cam.ac.uk>.
1998-11-29 Roland McGrath <roland@baalperazim.frob.com>
* malloc/thread-m.h [_LIBC]: Include <bits/libc-tsd.h>, and
remove tsd stuff from pthreads/cthreads libc sections.
Use __libc_tsd_define for MALLOC key.
[_LIBC] (tsd_key_t, tsd_key_create): Define to a zero-size type and a
no-op, respectively.
[_LIBC] (tsd_setspecific, tsd_getspecific): Use __libc_tsd_get/set.
* elf/dl-error.c: Include <bits/libc-tsd.h>.
Use __libc_tsd_define for DL_ERROR key.
(tsd_setspecific, tsd_getspecific): Rewritten using __libc_tsd_get/set.
* sysdeps/mach/hurd/bits/libc-tsd.h: New file.
* sysdeps/generic/bits/libc-tsd.h: New file.
* Makefile (distribute): Add bits/libc-tsd.h.
1998-10-12 Roland McGrath <roland@baalperazim.frob.com>
* elf/dl-error.c: Remove kludge to check for ld.so load address.
There is no need if weak undefined symbols are not used in ld.so;
see linuxthreads/ChangeLog for changes to files
linuxthreads/sysdeps/pthread/bits/libc-lock.h and
linuxthreads/sysdeps/pthread/bits/libc-tsd.h.
1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/i386/bits/string.h (__memset_cc): Fix typo (s->__s).
* sysdeps/i386/i486/bits/string.h: Add prototypes for all new
inline functions.
* sysdeps/i386/bits/string.h: Likewise.
1998-11-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Remove ipc_kludge.
1998-11-30 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* db2/progs/db_load/db_load.c (main): Avoid -Wparentheses warning.
Diffstat (limited to 'malloc/thread-m.h')
-rw-r--r-- | malloc/thread-m.h | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/malloc/thread-m.h b/malloc/thread-m.h index d9e1739..bb9cba5 100644 --- a/malloc/thread-m.h +++ b/malloc/thread-m.h @@ -40,20 +40,8 @@ typedef pthread_t thread_id; /* mutex */ typedef pthread_mutex_t mutex_t; -/* thread specific data */ -typedef void * tsd_key_t; - #define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#define tsd_key_create(key, destr) ( *(key) = NULL ) -#define tsd_setspecific(key, data) \ - if (__libc_internal_tsd_set != NULL) { \ - __libc_internal_tsd_set(_LIBC_TSD_KEY_MALLOC, data); \ - } else { (key) = (Void_t *) data; } -#define tsd_getspecific(key, vptr) \ - (vptr = (__libc_internal_tsd_get != NULL \ - ? __libc_internal_tsd_get(_LIBC_TSD_KEY_MALLOC) : (key))) - #define mutex_init(m) \ (__pthread_mutex_init != NULL ? __pthread_mutex_init (m, NULL) : 0) #define mutex_lock(m) \ @@ -85,20 +73,6 @@ typedef void * tsd_key_t; #define mutex_trylock(m) (!__mutex_trylock(m)) -#include <hurd/threadvar.h> - -/* thread specific data */ -typedef int tsd_key_t; - -static int tsd_keys_alloced = 0; - -#define tsd_key_create(key, destr) \ - (assert (tsd_keys_alloced == 0), tsd_keys_alloced++) -#define tsd_setspecific(key, data) \ - (*__hurd_threadvar_location (_HURD_THREADVAR_MALLOC) = (unsigned long)(data)) -#define tsd_getspecific(key, vptr) \ - ((vptr) = (void *)*__hurd_threadvar_location (_HURD_THREADVAR_MALLOC)) - #define thread_atfork(prepare, parent, child) do {} while(0) #define thread_atfork_static(prepare, parent, child) \ text_set_element(_hurd_fork_prepare_hook, prepare); \ @@ -114,6 +88,18 @@ static int tsd_keys_alloced = 0; #endif /* MUTEX_INITIALIZER && PTHREAD_MUTEX_INITIALIZER */ + +/* thread specific data */ + +#include <bits/libc-tsd.h> + +typedef int tsd_key_t[0]; /* no key data structure, libc magic does it */ +__libc_tsd_define (, MALLOC) /* declaration/common definition */ +#define tsd_key_create(key, destr) ((void) (key)) +#define tsd_setspecific(key, data) __libc_tsd_set (MALLOC, (data)) +#define tsd_getspecific(key, vptr) ((vptr) = __libc_tsd_get (MALLOC)) + + #elif defined(USE_PTHREADS) /* Posix threads */ #include <pthread.h> |