AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 06:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

sunrpc: Rewrite with explicit TLS access using __thread

Browse Source
This commit is contained in:
Florian Weimer 2015-10-17 12:07:04 +02:00
parent 6782806d8f
commit 4e1665024a
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2015-10-17 Florian Weimer <fweimer@redhat.com>
sunrpc: Rewrite with explicit TLS access using __thread.
* sunrpc/rpc_thread.c (thread_rpc_vars): New TLS variable.
(__rpc_thread_destroy, rpc_thread_multi): Access thread_rpc_vars
directly.
(__rpc_thread_variables): Access thread_rpc_vars directly.
Eliminate redundant assignment of the tvp variable.
2015-10-17 Florian Weimer <fweimer@redhat.com> 2015-10-17 Florian Weimer <fweimer@redhat.com>
malloc: Rewrite with explicit TLS access using __thread. malloc: Rewrite with explicit TLS access using __thread.

22
sunrpc/rpc_thread.c
View File

@ -10,7 +10,8 @@
/* Variable used in non-threaded applications or for the first thread. */ /* 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_mem;
__libc_tsd_define (, struct rpc_thread_variables *, RPC_VARS) static __thread struct rpc_thread_variables *thread_rpc_vars
attribute_tls_model_ie;
/* /*
* Task-variable destructor * Task-variable destructor
@ -18,8 +19,7 @@ __libc_tsd_define (, struct rpc_thread_variables *, RPC_VARS)
void __attribute__ ((section ("__libc_thread_freeres_fn"))) void __attribute__ ((section ("__libc_thread_freeres_fn")))
__rpc_thread_destroy (void) __rpc_thread_destroy (void)
{ {
struct rpc_thread_variables *tvp struct rpc_thread_variables *tvp = thread_rpc_vars;
= __libc_tsd_get (struct rpc_thread_variables *, RPC_VARS);
if (tvp != NULL) { if (tvp != NULL) {
__rpc_thread_svc_cleanup (); __rpc_thread_svc_cleanup ();
@ -34,7 +34,7 @@ __rpc_thread_destroy (void)
free (tvp->svc_pollfd_s); free (tvp->svc_pollfd_s);
if (tvp != &__libc_tsd_RPC_VARS_mem) if (tvp != &__libc_tsd_RPC_VARS_mem)
free (tvp); free (tvp);
__libc_tsd_set (struct rpc_thread_variables *, RPC_VARS, NULL); thread_rpc_vars = NULL;
} }
} }
#ifdef _LIBC_REENTRANT #ifdef _LIBC_REENTRANT
@ -49,8 +49,7 @@ text_set_element (__libc_subfreeres, __rpc_thread_destroy);
static void static void
rpc_thread_multi (void) rpc_thread_multi (void)
{ {
__libc_tsd_set (struct rpc_thread_variables *, RPC_VARS, thread_rpc_vars = &__libc_tsd_RPC_VARS_mem;
&__libc_tsd_RPC_VARS_mem);
} }
@ -58,20 +57,15 @@ struct rpc_thread_variables *
__rpc_thread_variables (void) __rpc_thread_variables (void)
{ {
__libc_once_define (static, once); __libc_once_define (static, once);
struct rpc_thread_variables *tvp; struct rpc_thread_variables *tvp = thread_rpc_vars;
tvp = __libc_tsd_get (struct rpc_thread_variables *, RPC_VARS);
if (tvp == NULL) { if (tvp == NULL) {
__libc_once (once, rpc_thread_multi); __libc_once (once, rpc_thread_multi);
tvp = __libc_tsd_get (struct rpc_thread_variables *, RPC_VARS); tvp = thread_rpc_vars;
if (tvp == NULL) { if (tvp == NULL) {
tvp = calloc (1, sizeof *tvp); tvp = calloc (1, sizeof *tvp);
if (tvp != NULL) if (tvp != NULL)
__libc_tsd_set (struct rpc_thread_variables *, thread_rpc_vars = tvp;
RPC_VARS, tvp);
else
tvp = __libc_tsd_get (struct rpc_thread_variables *,
RPC_VARS);
} }
} }
return tvp; return tvp;