diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-12-08 08:01:13 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-08 08:01:13 +0000 |
commit | f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9 (patch) | |
tree | f64c3eeda0e9acc58b96c28ca852a014c822047f /malloc/thread-m.h | |
parent | 42054ddb496798d9b936490cf0050f6619f86bc1 (diff) | |
download | glibc-f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9.zip glibc-f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9.tar.gz glibc-f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9.tar.bz2 |
update from main archive 961207cvs/libc-961208
Sun Dec 8 06:56:49 1996 Ulrich Drepper <drepper@cygnus.com>
* io/getwd.c: Use PATH_MAX not LOCAL_PATH_MAX. Fix typo in
comment.
* stdlib/canonicalize.c: Correct bugs in last change.
Patch by HJ Lu.
* libio/Makefile (routines): Remove ioprims.
(aux): Remove cleanup.
Add IO_DEBUG option for .o files.
* libio/cleanups.c: Removed.
* libio/ioprims.c: Removed.
* libio/filedoalloc.c: More updates from libg++-2.8b5.
* libio/fileops.c: Likewise.
* libio/genops.c: Likewise.
* libio/iolibio.h: Likewise.
* libio/iopopen.c: Likewise.
* libio/iovsprintf.c: Likewise.
* libio/iovsscanf.c: Likewise.
* libio/libio.h: Likewise.
* libio/libioP.h: Likewise.
* libio/memstream.c: Likewise.
* libio/strfile.h: Likewise.
* libio/vasprintf.c: Likewise.
* libio/vsnprintf.c: Likewise.
* libio/stdio.h: Define P_tmpdir only is __USE_SVID.
* manual/arith.texi: Change references to ANSI C to ISO C.
* manual/conf.texi: Likewise.
* manual/creature.texi: Likewise.
* manual/ctype.texi: Likewise.
* manual/errno.texi: Likewise.
* manual/filesys.texi: Likewise.
* manual/intro.texi. Likewise.
* manual/io.texi: Likewise.
* manual/lang.texi: Likewise.
* manual/libc.texinfo: Likewise.
* manual/locale.texi: Likewise.
* manual/maint.texi: Likewise.
* manual/mbyte.texi: Likewise.
* manual/memory.texi: Likewise.
* manual/process.texi: Likewise.
* manual/process.texi: Likewise.
* manual/search.texi: Likewise.
* manual/setjmp.texi: Likewise.
* manual/signal.texi: Likewise.
* manual/startup.texi: Likewise.
* manual/stdio.texi: Likewise.
* manual/string.texi: Likewise.
* manual/time.texi: Likewise.
* manual/locale.texi: Remove description of LC_RESPONSE and add
LC_MESSAGES.
* Makefile (subdirs): Change malloc in $(malloc).
* config.make.in: Add variable malloc which is initialized from
@malloc@.
* configure.in: Add new option --enable-new-malloc to use new
malloc. This is the default on Linux.
* sysdeps/unix/sysv/linux/configure.in: Define malloc to new-malloc
by default.
* new-malloc/Makefile: New file. Improved malloc implementation.
* new-malloc/malloc.c: Likewise.
* new-malloc/malloc.h: Likewise.
* new-malloc/mallocbug.c: Likewise.
* new-malloc/obstack.c: Likewise.
* new-malloc/obstack.h: Likewise.
* new-malloc/thread-m.h: Likewise.
* time/Makefile: Compile ap.c with NO_MCHECK flag for now.
* time/ap.c: Don't call mcheck if NO_MCHECK is defined.
* resolv/Makefile: Add rule to rebuiild libresolv.so when libc.so
changed.
* stdio/feof.c: Update copyright.
* stdio/stdio.h: Add field for lock to FILE structure.
Add cast to *MAGIC constants to prevent warnings.
* stdio-common/bug7.c: Correct test. Stream must not be closed
twice.
* stdlib/Makefile (routines): Add secure-getenv.
* stdlib/secure-getenv.c: New file. __secure_getenv function
moved to here from sysdeps/generic/getenv.c. Otherwise an
application cannot replace the getenv function in the libc.
* sysdeps/generic/getenv.c: Remove __secure_getenv function.
* sysdeps/stub/getenv.c: Remove __secure_getenv alias.
* sysdeps/mach/libc-lock.h: Define__libc_mutex_lock to __mutex_lock.
* sysdeps/posix/fdopen.c: Update copyright. Don't use EXFUN.
* time/test-tz.c: Comment fifth test out. PROBLEM.
* time/tzset.c: De-ANSI-declfy.
(__tzset): Don't increment pointer tz when no DST information is
given.
Sat Dec 7 23:47:54 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/libc-lock.h [_LIBC]: Add definition of
__libc_mutex_lock.
Patch by Thomas Bushnell.
* sysdeps/unix/sysv/linux/timebits.h: Load <asm/param.h> only
if __USE_MISC.
* sysdeps/unix/sysv/linux/Dist: Add llseek.c.
Sat Dec 7 12:18:56 1996 Ulrich Drepper <drepper@cygnus.com>
* time/strftime (%c format): Remove %Z from default string.
Reported by Paul Eggert
* io/getwd.c: Don't apply getcwd on user supplied buffer.
Diffstat (limited to 'malloc/thread-m.h')
-rw-r--r-- | malloc/thread-m.h | 176 |
1 files changed, 176 insertions, 0 deletions
diff --git a/malloc/thread-m.h b/malloc/thread-m.h new file mode 100644 index 0000000..371e491 --- /dev/null +++ b/malloc/thread-m.h @@ -0,0 +1,176 @@ +/* Basic platform-independent macro definitions for mutexes and + thread-specific data. + 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. + + 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 + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + 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 + defined, otherwise the token NO_THREADS * and dummy implementations + of the macros will be defined. */ + +#ifndef _THREAD_M_H +#define _THREAD_M_H + +#if defined(_LIBC) /* The GNU C library, a special case of Posix threads */ + +#include <libc-lock.h> + +#ifdef PTHREAD_MUTEX_INITIALIZER + +typedef pthread_t thread_id; + +/* mutex */ +typedef pthread_mutex_t mutex_t; + +/* thread specific data */ +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); } else { *(key) = (tsd_key_t) 0; } +#define tsd_setspecific(key, data) \ + if (__pthread_setspecific != NULL) { \ + __pthread_setspecific(key, data); } else { (key) = (tsd_key_t) data; } +#define tsd_getspecific(key, vptr) \ + (vptr = (__pthread_getspecific != NULL ? \ + __pthread_getspecific(key) : (tsd_key_t *) (key))) + +#define mutex_init(m) \ + (__pthread_mutex_init != NULL ? __pthread_mutex_init (m, NULL) : 0) +#define mutex_lock(m) \ + (__pthread_mutex_lock != NULL ? __pthread_mutex_lock (m) : 0) +#define mutex_trylock(m) \ + (__pthread_mutex_trylock != NULL ? __pthread_mutex_trylock (m) : 0) +#define mutex_unlock(m) \ + (__pthread_mutex_unlock != NULL ? __pthread_mutex_unlock (m) : 0) + +#elif defined(MUTEX_INITIALIZER) + +typedef thread_t thread_id; + +/* mutex */ +typedef mutex_t mutex_t; + +/* thread specific data */ +typedef pthread_key_t tsd_key_t; + +#define mutex_init(m) __mutex_init (m) +#define mutex_lock(m) __mutex_lock (m) +#define mutex_trylock(m) __mutex_trylock (m) +#define mutex_unlock(m) __mutex_unlock (m) + +#else + +#define NO_THREADS + +#endif /* MUTEX_INITIALIZER && PTHREAD_MUTEX_INITIALIZER */ + +#elif defined(USE_PTHREADS) /* Posix threads */ + +#include <pthread.h> + +typedef pthread_t thread_id; + +/* mutex */ +typedef pthread_mutex_t mutex_t; + +#define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#define mutex_init(m) pthread_mutex_init(m, NULL) +#define mutex_lock(m) pthread_mutex_lock(m) +#define mutex_trylock(m) pthread_mutex_trylock(m) +#define mutex_unlock(m) pthread_mutex_unlock(m) + +/* thread specific data */ +typedef pthread_key_t tsd_key_t; + +#define tsd_key_create(key, destr) pthread_key_create(key, destr) +#define tsd_setspecific(key, data) pthread_setspecific(key, data) +#define tsd_getspecific(key, vptr) (vptr = pthread_getspecific(key)) + +#elif USE_THR /* Solaris threads */ + +#include <thread.h> + +typedef thread_t thread_id; + +#define MUTEX_INITIALIZER { 0 } +#define mutex_init(m) mutex_init(m, USYNC_THREAD, NULL) + +/* + * Hack for thread-specific data on Solaris. We can't use thr_setspecific + * because that function calls malloc() itself. + */ +typedef void *tsd_key_t[256]; +#define tsd_key_create(key, destr) do { \ + int i; \ + for(i=0; i<256; i++) (*key)[i] = 0; \ +} while(0) +#define tsd_setspecific(key, data) (key[(unsigned)thr_self() % 256] = (data)) +#define tsd_getspecific(key, vptr) (vptr = key[(unsigned)thr_self() % 256]) + +#elif USE_SPROC /* SGI sproc() threads */ + +#include <sys/wait.h> +#include <sys/types.h> +#include <sys/prctl.h> +#include <abi_mutex.h> + +typedef int thread_id; + +typedef abilock_t mutex_t; + +#define MUTEX_INITIALIZER { 0 } +#define mutex_init(m) init_lock(m) +#define mutex_lock(m) (spin_lock(m), 0) +#define mutex_trylock(m) acquire_lock(m) +#define mutex_unlock(m) release_lock(m) + +typedef int tsd_key_t; +int tsd_key_next; +#define tsd_key_create(key, destr) ((*key) = tsd_key_next++) +#define tsd_setspecific(key, data) (((void **)(&PRDA->usr_prda))[key] = data) +#define tsd_getspecific(key, vptr) (vptr = ((void **)(&PRDA->usr_prda))[key]) + +#else /* no _LIBC or USE_... are defined */ + +#define NO_THREADS + +#endif /* defined(_LIBC) */ + +#ifdef NO_THREADS /* No threads, provide dummy macros */ + +typedef int thread_id; + +typedef int mutex_t; + +#define MUTEX_INITIALIZER 0 +#define mutex_init(m) (*(m) = 0) +#define mutex_lock(m) (0) +#define mutex_trylock(m) (0) +#define mutex_unlock(m) (0) + +typedef void *tsd_key_t; +#define tsd_key_create(key, destr) (*(key) = NULL) +#define tsd_setspecific(key, data) ((key) = data) +#define tsd_getspecific(key, vptr) (vptr = (key)) + +#endif /* defined(NO_THREADS) */ + +#endif /* !defined(_THREAD_M_H) */ |