diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 22 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 2 | ||||
| -rw-r--r-- | linuxthreads/internals.h | 2 | ||||
| -rw-r--r-- | linuxthreads/no-tsd.c | 33 | ||||
| -rw-r--r-- | linuxthreads/specific.c | 10 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/bits/libc-lock.h | 17 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/bits/libc-tsd.h | 43 |
7 files changed, 108 insertions, 21 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 34486668bd..32b0159701 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,25 @@ +1998-11-29 Roland McGrath <roland@baalperazim.frob.com> + + * sysdeps/pthread/bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_get, + __libc_tsd_set): New macros for new interface. + * no-tsd.c: New file, provide uninitialized defns of + __libc_internal_tsd_get and __libc_internal_tsd_set. + * Makefile (routines): Add no-tsd. + +1998-10-12 Roland McGrath <roland@baalperazim.frob.com> + + * internals.h: Include <bits/libc-tsd.h>, not <bits/libc-lock.h>. + * sysdeps/pthread/bits/libc-lock.h (__libc_internal_tsd_get, + __libc_internal_tsd_set): Move decls to ... + * sysdeps/pthread/bits/libc-tsd.h: New file for __libc_internal_tsd_* + declarations. + + * sysdeps/pthread/bits/libc-lock.h (__libc_internal_tsd_get, + __libc_internal_tsd_set): Make these pointers to functions, not + functions; remove #pragma weak decls for them. + * specific.c (__libc_internal_tsd_get, __libc_internal_tsd_set): + Define static functions and initialized pointers to them. + 1998-11-18 Ulrich Drepper <drepper@cygnus.com> * Makefile (CFLAGS-mutex.c): Define as -D__NO_WEAK_PTHREAD_ALIASES. diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index aad7106f4c..c19145fc00 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -27,7 +27,7 @@ linuxthreads-version := $(shell sed -n 's/^.*$(subdir)-\([0-9.]*\).*$$/\1/p' \ headers := pthread.h semaphore.h bits/semaphore.h distribute := internals.h queue.h restart.h spinlock.h -routines := weaks +routines := weaks no-tsd extra-libs := libpthread extra-libs-others := $(extra-libs) diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h index d11cf8471a..9765402dd1 100644 --- a/linuxthreads/internals.h +++ b/linuxthreads/internals.h @@ -16,7 +16,7 @@ /* Includes */ -#include <bits/libc-lock.h> /* for _LIBC_TSD_KEY_N */ +#include <bits/libc-tsd.h> /* for _LIBC_TSD_KEY_N */ #include <limits.h> #include <setjmp.h> #include <signal.h> diff --git a/linuxthreads/no-tsd.c b/linuxthreads/no-tsd.c new file mode 100644 index 0000000000..ef79cb8320 --- /dev/null +++ b/linuxthreads/no-tsd.c @@ -0,0 +1,33 @@ +/* libc-internal interface for thread-specific data. + Copyright (C) 1998 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 + 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. */ + +#include <bits/libc-tsd.h> + +/* This file provides uinitialized (common) definitions for the + hooks used internally by libc to access thread-specific data. + + When -lpthread is used, it provides initialized definitions for these + variables (in specific.c), which override these uninitialized definitions. + + If -lpthread is not used, these uninitialized variables default to zero, + which the __libc_tsd_* macros check for. */ + +void *(*__libc_internal_tsd_get) __P ((enum __libc_tsd_key_t)); +int (*__libc_internal_tsd_set) __P ((enum __libc_tsd_key_t, + __const void *)); diff --git a/linuxthreads/specific.c b/linuxthreads/specific.c index a86b1a0cec..674353dd39 100644 --- a/linuxthreads/specific.c +++ b/linuxthreads/specific.c @@ -161,17 +161,23 @@ void __pthread_destroy_specifics() /* Thread-specific data for libc. */ -int __libc_internal_tsd_set(enum __libc_tsd_key_t key, const void * pointer) +static int +libc_internal_tsd_set(enum __libc_tsd_key_t key, const void * pointer) { pthread_descr self = thread_self(); THREAD_SETMEM_NC(self, p_libc_specific[key], (void *) pointer); return 0; } +int (*__libc_internal_tsd_set)(enum __libc_tsd_key_t key, const void * pointer) + = libc_internal_tsd_set; -void * __libc_internal_tsd_get(enum __libc_tsd_key_t key) +static void * +libc_internal_tsd_get(enum __libc_tsd_key_t key) { pthread_descr self = thread_self(); return THREAD_GETMEM_NC(self, p_libc_specific[key]); } +void * (*__libc_internal_tsd_get)(enum __libc_tsd_key_t key) + = libc_internal_tsd_get; diff --git a/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/linuxthreads/sysdeps/pthread/bits/libc-lock.h index 1763a42cda..593117073c 100644 --- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h +++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h @@ -149,19 +149,6 @@ typedef pthread_key_t __libc_key_t; #define __libc_setspecific(KEY, VALUE) \ (__pthread_setspecific != NULL ? __pthread_setspecific (KEY, VALUE) : 0) -#ifdef _LIBC - -/* Fast thread-specific data internal to libc. */ -enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0, - _LIBC_TSD_KEY_DL_ERROR, - _LIBC_TSD_KEY_N }; - -extern void *__libc_internal_tsd_get __P ((enum __libc_tsd_key_t)); -extern int __libc_internal_tsd_set __P ((enum __libc_tsd_key_t, - __const void *)); - -#endif - /* Register handlers to execute before and after `fork'. */ #define __libc_atfork(PREPARE, PARENT, CHILD) \ @@ -183,8 +170,6 @@ weak_extern (__pthread_mutexattr_settype) weak_extern (__pthread_key_create) weak_extern (__pthread_setspecific) weak_extern (__pthread_getspecific) -weak_extern (__libc_internal_tsd_get) -weak_extern (__libc_internal_tsd_set) weak_extern (__pthread_once) weak_extern (__pthread_initialize) weak_extern (__pthread_atfork) @@ -202,8 +187,6 @@ weak_extern (_pthread_cleanup_pop_restore) # pragma weak __pthread_key_create # pragma weak __pthread_setspecific # pragma weak __pthread_getspecific -# pragma weak __libc_internal_tsd_get -# pragma weak __libc_internal_tsd_set # pragma weak __pthread_once # pragma weak __pthread_initialize # pragma weak __pthread_atfork diff --git a/linuxthreads/sysdeps/pthread/bits/libc-tsd.h b/linuxthreads/sysdeps/pthread/bits/libc-tsd.h new file mode 100644 index 0000000000..42a8b802c9 --- /dev/null +++ b/linuxthreads/sysdeps/pthread/bits/libc-tsd.h @@ -0,0 +1,43 @@ +/* libc-internal interface for thread-specific data. LinuxThreads version. + Copyright (C) 1997, 1998 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 + 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. */ + +#ifndef _BITS_LIBC_TSD_H +#define _BITS_LIBC_TSD_H 1 + + +/* Fast thread-specific data internal to libc. */ +enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0, + _LIBC_TSD_KEY_DL_ERROR, + _LIBC_TSD_KEY_N }; + +extern void *(*__libc_internal_tsd_get) __P ((enum __libc_tsd_key_t)); +extern int (*__libc_internal_tsd_set) __P ((enum __libc_tsd_key_t, + __const void *)); + +#define __libc_tsd_define(CLASS, KEY) CLASS void *__libc_tsd_##KEY##_data; +#define __libc_tsd_get(KEY) \ + (__libc_internal_tsd_get != NULL \ + ? __libc_internal_tsd_get (_LIBC_TSD_KEY_##KEY) \ + : __libc_tsd_##KEY##_data) +#define __libc_tsd_set(KEY, VALUE) \ + (__libc_internal_tsd_set != NULL \ + ? __libc_internal_tsd_set (_LIBC_TSD_KEY_##KEY, (VALUE)) \ + : ((__libc_tsd_##KEY##_data = (VALUE)), 0)) + +#endif /* bits/libc-tsd.h */ |