diff options
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.c | 3 | ||||
| -rw-r--r-- | malloc/thread-m.h | 21 |
2 files changed, 16 insertions, 8 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 22f2ee89ed..3e843541eb 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1,7 +1,8 @@ /* Malloc implementation for multiple threads without lock contention. Copyright (C) 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>, 1996. + Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de> + and Doug Lea <dl@cs.oswego.edu>, 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as diff --git a/malloc/thread-m.h b/malloc/thread-m.h index 331afc71e8..10da26ba32 100644 --- a/malloc/thread-m.h +++ b/malloc/thread-m.h @@ -19,7 +19,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* One out of _LIBC, USE_PTHREADS, USE_THR, or USE_SPROC should be +/* One out of _LIBC, USE_PTHREADS, USE_THR or USE_SPROC should be defined, otherwise the token NO_THREADS and dummy implementations of the macros will be defined. */ @@ -42,12 +42,19 @@ typedef pthread_key_t tsd_key_t; #define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#define tsd_key_create(key, destr) \ - if (__pthread_key_create != NULL) { __pthread_key_create(key, destr); } -#define tsd_setspecific(key, data) \ - if (__pthread_setspecific != NULL) { __pthread_setspecific(key, data); } -#define tsd_getspecific(key, vptr) \ - (vptr = (__pthread_getspecific != NULL ? __pthread_getspecific(key) : NULL)) +static Void_t *malloc_key_data; + +#define tsd_key_create(key, destr) \ + if (__pthread_key_create != NULL) { \ + __pthread_key_create(key, destr); \ + } else { *(key) = (tsd_key_t) 0; } +#define tsd_setspecific(key, data) \ + if (__pthread_setspecific != NULL) { \ + __pthread_setspecific(key, data); \ + } else { malloc_key_data = (Void_t *) data; } +#define tsd_getspecific(key, vptr) \ + (vptr = (__pthread_getspecific != NULL \ + ? __pthread_getspecific(key) : malloc_key_data)) #define mutex_init(m) \ (__pthread_mutex_init != NULL ? __pthread_mutex_init (m, NULL) : 0) |