about summary refs log tree commit diff
path: root/sunrpc/rpc
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
parent5e3114974a1982e53f368a09387d0dad1aad1ec1 (diff)
downloadglibc-543cf8a9e162a9a812770c628fa06c7a256752ee.tar.gz
glibc-543cf8a9e162a9a812770c628fa06c7a256752ee.tar.xz
glibc-543cf8a9e162a9a812770c628fa06c7a256752ee.zip
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')
-rw-r--r--sunrpc/rpc/rpc.h24
1 files changed, 24 insertions, 0 deletions
diff --git a/sunrpc/rpc/rpc.h b/sunrpc/rpc/rpc.h
index a966d2e231..5150abf687 100644
--- a/sunrpc/rpc/rpc.h
+++ b/sunrpc/rpc/rpc.h
@@ -67,4 +67,28 @@
 /* routines for parsing /etc/rpc */
 #include <rpc/netdb.h>		/* structures and routines to parse /etc/rpc */
 
+
+/* Global variables, protected for multi-threaded applications.  */
+extern fd_set *__rpc_thread_svc_fdset (void) __attribute__ ((__const__));
+#define svc_fdset (*__rpc_thread_svc_fdset ())
+
+extern struct rpc_createerr *__rpc_thread_createerr (void)
+     __attribute__ ((__const__));
+#define get_rpc_createerr() (*__rpc_thread_createerr ())
+/* The people who "engineered" RPC should bee punished for naming the
+   data structure and the variable the same.  We cannot always define the
+   macro 'rpc_createerr' because this would prevent people from defining
+   object of type 'struct rpc_createerr'.  So we leave it up to the user
+   to select transparent replacement also of this variable.  */
+#ifdef _RPC_MT_VARS
+# define rpc_createerr (*__rpc_thread_createerr ())
+#endif
+
+extern struct pollfd **__rpc_thread_svc_pollfd (void)
+     __attribute__ ((__const__));
+#define svc_pollfd (*__rpc_thread_svc_pollfd ())
+
+extern int *__rpc_thread_svc_max_pollfd (void) __attribute__ ((__const__));
+#define svc_max_pollfd (*__rpc_thread_svc_max_pollfd ())
+
 #endif /* rpc/rpc.h */