aboutsummaryrefslogtreecommitdiff
path: root/sunrpc/rpc_thread.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-03-26 05:17:47 +0000
committerUlrich Drepper <drepper@redhat.com>2001-03-26 05:17:47 +0000
commit543cf8a9e162a9a812770c628fa06c7a256752ee (patch)
tree97fcdc6ddfa94d8a296c808a60768212bbbe1039 /sunrpc/rpc_thread.c
parent5e3114974a1982e53f368a09387d0dad1aad1ec1 (diff)
downloadglibc-543cf8a9e162a9a812770c628fa06c7a256752ee.zip
glibc-543cf8a9e162a9a812770c628fa06c7a256752ee.tar.gz
glibc-543cf8a9e162a9a812770c628fa06c7a256752ee.tar.bz2
Update.
Add changes which were in this form in the original patch by Eric Norum <eric.norum@usask.ca>. * include/rpc/rpc.h: Remove svc_fdset, rpc_createerr, svc_pollfd, and svc_max_pollfd. * sunrpc/rpc/rpc.h: Declare __rpc_thread_svc_fdset, __rpc_thread_createerr, __rpc_thread_svc_pollfd, and __rpc_thread_svc_max_pollfd. Define svc_fdset, get_rpc_createerr, svc_pollfd, and svc_max_pollfd. * sunrpc/rpc_thread.c: Handle first thread special, it uses the global variables. Define __rpc_thread_svc_fdset, __rpc_thread_createerr, __rpc_thread_svc_pollfd, and __rpc_thread_svc_max_pollfd. * sunrpc/Versions [libc] (GLIBC_2.2.3): Export __rpc_thread_svc_fdset, __rpc_thread_createerr, __rpc_thread_svc_pollfd, and __rpc_thread_svc_max_pollfd. * sunrpc/clnt_gen.c: Replace use of rpc_createerr by call to get_rpc_createerr. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/pm_getport.c: Likewise.
Diffstat (limited to 'sunrpc/rpc_thread.c')
-rw-r--r--sunrpc/rpc_thread.c85
1 files changed, 79 insertions, 6 deletions
diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
index 0b004c4..1fd1c14 100644
--- a/sunrpc/rpc_thread.c
+++ b/sunrpc/rpc_thread.c
@@ -14,6 +14,10 @@ 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;
+
+/* This is the variable used for the first thread. */
+static struct rpc_thread_variables rpc_default;
+
/*
* Task-variable destructor
*/
@@ -22,7 +26,7 @@ __rpc_thread_destroy (void)
{
struct rpc_thread_variables *tvp = __rpc_thread_variables();
- if (tvp != NULL) {
+ if (tvp != NULL && tvp != &rpc_default) {
__rpc_thread_svc_cleanup ();
__rpc_thread_clnt_cleanup ();
__rpc_thread_key_cleanup ();
@@ -37,19 +41,88 @@ __rpc_thread_destroy (void)
}
+/*
+ * Initialize RPC multi-threaded operation
+ */
+static void
+rpc_thread_multi (void)
+{
+ __libc_tsd_set (RPC_VARS, &rpc_default);
+}
+
+
struct rpc_thread_variables *
__rpc_thread_variables (void)
{
+ __libc_once_define (static, once);
struct rpc_thread_variables *tvp;
tvp = __libc_tsd_get (RPC_VARS);
if (tvp == NULL) {
- tvp = calloc (1, sizeof *tvp);
- if (tvp != NULL)
- __libc_tsd_set (RPC_VARS, tvp);
- else
- tvp = __libc_tsd_RPC_VARS_data;
+ __libc_once (once, rpc_thread_multi);
+ tvp = __libc_tsd_get (RPC_VARS);
+ if (tvp == NULL) {
+ tvp = calloc (1, sizeof *tvp);
+ if (tvp != NULL)
+ __libc_tsd_set (RPC_VARS, tvp);
+ else
+ tvp = __libc_tsd_RPC_VARS_data;
+ }
}
return tvp;
}
+
+
+/* Global variables If we're single-threaded, or if this is the first
+ thread using the variable, use the existing global variable. This
+ provides backwards compatability for existing applications which
+ dynamically link against this code. */
+#undef svc_fdset
+#undef rpc_createerr
+#undef svc_pollfd
+#undef svc_max_pollfd
+
+fd_set *
+__rpc_thread_svc_fdset (void)
+{
+ struct rpc_thread_variables *tvp;
+
+ tvp = __rpc_thread_variables ();
+ if (tvp == &rpc_default)
+ return &svc_fdset;
+ return &tvp->svc_fdset_s;
+}
+
+struct rpc_createerr *
+__rpc_thread_createerr (void)
+{
+ struct rpc_thread_variables *tvp;
+
+ tvp = __rpc_thread_variables ();
+ if (tvp == &rpc_default)
+ return &rpc_createerr;
+ return &tvp->rpc_createerr_s;
+}
+
+struct pollfd **
+__rpc_thread_svc_pollfd (void)
+{
+ struct rpc_thread_variables *tvp;
+
+ tvp = __rpc_thread_variables ();
+ if (tvp == &rpc_default)
+ return &svc_pollfd;
+ return &tvp->svc_pollfd_s;
+}
+
+int *
+__rpc_thread_svc_max_pollfd (void)
+{
+ struct rpc_thread_variables *tvp;
+
+ tvp = __rpc_thread_variables ();
+ if (tvp == &rpc_default)
+ return &svc_max_pollfd;
+ return &tvp->svc_max_pollfd_s;
+}
#endif /* _RPC_THREAD_SAFE_ */