mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +03:00
* bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_address,
__libc_tsd_get, __libc_tsd_set): Add TYPE argument, use it as the type of the thread variable instead of void *. * sysdeps/mach/hurd/bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_address, __libc_tsd_get, __libc_tsd_set): Likewise. * include/ctype.h (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust __libc_tsd_define arguments. (__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): Adjust __libc_tsd_address arguments. Remove union hack. * include/rpc/rpc.h (RPC_VARS): Adjust __libc_tsd_define arguments. * sunrpc/rpc_thread.c (RPC_VARS): Likewise. (__rpc_thread_destroy, rpc_thread_multi, __rpc_thread_variables): Adjust __libc_tsd_{set,get} arguments. * ctype/ctype-info.c (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust __libc_tsd_define arguments. * locale/uselocale.c (__uselocale): Adjust __libc_tsd_{set,get} arguments. * locale/lc-ctype.c (_nl_postload_ctype): Likewise. * locale/global-locale.c (__libc_tsd_LOCALE): Adjust type. (LOCALE): Adjust __libc_tsd_define arguments. * locale/localeinfo.h (_NL_CURRENT_LOCALE): Adjust __libc_tsd_get arguments. (LOCALE): Adjust __libc_tsd_define arguments. * sysdeps/mach/hurd/malloc-machine.h (MALLOC): Adjust __libc_tsd_define arguments. (tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get} arguments. nptl/ * sysdeps/pthread/malloc-machine.h (MALLOC): Adjust __libc_tsd_define arguments. (tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get} arguments. 2008-11-07 Jakub Jelinek <jakub@redhat.com> * bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_address, __libc_tsd_get, __libc_tsd_set): Add TYPE argument, use it as the type of the thread variable instead of void *. * sysdeps/mach/hurd/bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_address, __libc_tsd_get, __libc_tsd_set): Likewise. * include/ctype.h (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust __libc_tsd_define arguments. (__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): Adjust __libc_tsd_address arguments. Remove union hack. * include/rpc/rpc.h (RPC_VARS): Adjust __libc_tsd_define arguments. * sunrpc/rpc_thread.c (RPC_VARS): Likewise. (__rpc_thread_destroy, rpc_thread_multi, __rpc_thread_variables): Adjust __libc_tsd_{set,get} arguments. * ctype/ctype-info.c (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust __libc_tsd_define arguments. * locale/uselocale.c (__uselocale): Adjust __libc_tsd_{set,get} arguments. * locale/lc-ctype.c (_nl_postload_ctype): Likewise. * locale/global-locale.c (__libc_tsd_LOCALE): Adjust type. (LOCALE): Adjust __libc_tsd_define arguments. * locale/localeinfo.h (_NL_CURRENT_LOCALE): Adjust __libc_tsd_get arguments. (LOCALE): Adjust __libc_tsd_define arguments. * sysdeps/mach/hurd/malloc-machine.h (MALLOC): Adjust __libc_tsd_define arguments. (tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get} arguments.
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
|
||||
/* Variable used in non-threaded applications or for the first thread. */
|
||||
static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
|
||||
__libc_tsd_define (, RPC_VARS)
|
||||
__libc_tsd_define (, struct rpc_thread_variables *, RPC_VARS)
|
||||
|
||||
/*
|
||||
* Task-variable destructor
|
||||
@@ -18,7 +18,8 @@ __libc_tsd_define (, RPC_VARS)
|
||||
void __attribute__ ((section ("__libc_thread_freeres_fn")))
|
||||
__rpc_thread_destroy (void)
|
||||
{
|
||||
struct rpc_thread_variables *tvp = __libc_tsd_get (RPC_VARS);
|
||||
struct rpc_thread_variables *tvp
|
||||
= __libc_tsd_get (struct rpc_thread_variables *, RPC_VARS);
|
||||
|
||||
if (tvp != NULL) {
|
||||
__rpc_thread_svc_cleanup ();
|
||||
@@ -33,7 +34,7 @@ __rpc_thread_destroy (void)
|
||||
free (tvp->svc_pollfd_s);
|
||||
if (tvp != &__libc_tsd_RPC_VARS_mem)
|
||||
free (tvp);
|
||||
__libc_tsd_set (RPC_VARS, NULL);
|
||||
__libc_tsd_set (struct rpc_thread_variables *, RPC_VARS, NULL);
|
||||
}
|
||||
}
|
||||
#ifdef _LIBC_REENTRANT
|
||||
@@ -48,7 +49,8 @@ text_set_element (__libc_subfreeres, __rpc_thread_destroy);
|
||||
static void
|
||||
rpc_thread_multi (void)
|
||||
{
|
||||
__libc_tsd_set (RPC_VARS, &__libc_tsd_RPC_VARS_mem);
|
||||
__libc_tsd_set (struct rpc_thread_variables *, RPC_VARS,
|
||||
&__libc_tsd_RPC_VARS_mem);
|
||||
}
|
||||
|
||||
|
||||
@@ -58,16 +60,18 @@ __rpc_thread_variables (void)
|
||||
__libc_once_define (static, once);
|
||||
struct rpc_thread_variables *tvp;
|
||||
|
||||
tvp = __libc_tsd_get (RPC_VARS);
|
||||
tvp = __libc_tsd_get (struct rpc_thread_variables *, RPC_VARS);
|
||||
if (tvp == NULL) {
|
||||
__libc_once (once, rpc_thread_multi);
|
||||
tvp = __libc_tsd_get (RPC_VARS);
|
||||
tvp = __libc_tsd_get (struct rpc_thread_variables *, RPC_VARS);
|
||||
if (tvp == NULL) {
|
||||
tvp = calloc (1, sizeof *tvp);
|
||||
if (tvp != NULL)
|
||||
__libc_tsd_set (RPC_VARS, tvp);
|
||||
__libc_tsd_set (struct rpc_thread_variables *,
|
||||
RPC_VARS, tvp);
|
||||
else
|
||||
tvp = __libc_tsd_get (RPC_VARS);
|
||||
tvp = __libc_tsd_get (struct rpc_thread_variables *,
|
||||
RPC_VARS);
|
||||
}
|
||||
}
|
||||
return tvp;
|
||||
|
Reference in New Issue
Block a user