aboutsummaryrefslogtreecommitdiff
path: root/sunrpc/rpc_thread.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-02 03:32:24 +0000
committerRoland McGrath <roland@gnu.org>2002-08-02 03:32:24 +0000
commitc2afe833521105e05298500ba5d4676d6c833242 (patch)
tree226bb6da849fe8d860b766d3c365c8cfeb99b19e /sunrpc/rpc_thread.c
parentae8f7f19faf701667d5e88195e3efc479c4a0746 (diff)
downloadglibc-c2afe833521105e05298500ba5d4676d6c833242.zip
glibc-c2afe833521105e05298500ba5d4676d6c833242.tar.gz
glibc-c2afe833521105e05298500ba5d4676d6c833242.tar.bz2
* sysdeps/pthread/bits/libc-tsd.h: Include <tls.h>.
[USE_TLS && HAVE___THREAD]: Just include the sysdeps/generic file, which does the right thing when __thread support is available. * descr.h (struct _pthread_descr_struct) [USE_TLS && HAVE___THREAD]: Omit `p_libc_specific', `p_errnop', `p_errno', `p_h_errnop', `p_h_errno', `p_resp', and `p_res' members. * pthread.c (__pthread_initialize_minimal) [USE_TLS && HAVE___THREAD]: Don't initialize `p_errnop' and `p_h_errnop' members. (__pthread_reset_main_thread): Likewise. (__pthread_initialize_manager): Likewise. * manager.c (__pthread_manager, pthread_handle_create): Likewise. * pthread.c (pthread_initialize) [USE_TLS && HAVE___THREAD]: Don't initialize `p_resp' member. (__pthread_reset_main_thread): Likewise. * manager.c (pthread_handle_create): Likewise. * specific.c (libc_internal_tsd_set, libc_internal_tsd_get): Conditionalize these on [!(USE_TLS && HAVE___THREAD)]. * errno.c [USE_TLS && HAVE___THREAD] (__h_errno_location, __res_state): Don't define these at all. * sysdeps/i386/tls.h (INSTALL_DTV): Add parens around arguments! (INSTALL_NEW_DTV, GET_DTV): Likewise. * sysdeps/sh/tls.h (INSTALL_DTV, INSTALL_NEW_DTV, GET_DTV): Likewise. * weaks.c: Don't include <errno.h> here. 2002-08-01 Roland McGrath <roland@redhat.com> * sysdeps/i386/tls.h (TLS_DO_MODIFY_LDT): New macro, broken out of TLS_INIT_TP. (TLS_DO_SET_THREAD_AREA): New macro, uses thread_set_area syscall. (TLS_SETUP_GS_SEGMENT): New macro, try one or the other or both. (TLS_INIT_TP): Use that.
Diffstat (limited to 'sunrpc/rpc_thread.c')
-rw-r--r--sunrpc/rpc_thread.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
index 7f2e351..5c25963 100644
--- a/sunrpc/rpc_thread.c
+++ b/sunrpc/rpc_thread.c
@@ -8,11 +8,9 @@
#ifdef _RPC_THREAD_SAFE_
-
/* Variable used in non-threaded applications or for the first thread. */
static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
-static struct rpc_thread_variables *__libc_tsd_RPC_VARS_data =
- &__libc_tsd_RPC_VARS_mem;
+__libc_tsd_define (static, RPC_VARS)
/*
* Task-variable destructor
@@ -20,7 +18,7 @@ static struct rpc_thread_variables *__libc_tsd_RPC_VARS_data =
void
__rpc_thread_destroy (void)
{
- struct rpc_thread_variables *tvp = __rpc_thread_variables();
+ struct rpc_thread_variables *tvp = __libc_tsd_get (RPC_VARS);
if (tvp != NULL && tvp != &__libc_tsd_RPC_VARS_mem) {
__rpc_thread_svc_cleanup ();
@@ -61,7 +59,7 @@ __rpc_thread_variables (void)
if (tvp != NULL)
__libc_tsd_set (RPC_VARS, tvp);
else
- tvp = __libc_tsd_RPC_VARS_data;
+ tvp = __libc_tsd_get (RPC_VARS);
}
}
return tvp;