Re-backport all the rpc stuff from glibc 2.2.5. This allows us to make this

junk (and I do mean that ;-) thread safe without undue pain.  Adds 12k worth to
the code size I'm afraid, but since I never use NFS and therefore never include
this stuff, I guess thats acceptable.  I still need to enable the multi-threaded
bits...
 -Erik

1 files changed, 152 insertions, 0 deletions

diff --git a/libc/inet/rpc/rpc_thread.c b/libc/inet/rpc/rpc_thread.c
new file mode 100644
index 000000000..267149b62
--- /dev/null
+++ b/libc/inet/rpc/rpc_thread.c
@@ -0,0 +1,152 @@
+#define __FORCE_GLIBC
+#include <features.h>
+
+#include <stdio.h>
+#include <rpc/rpc.h>
+#include <assert.h>
+
+#ifdef _RPC_THREAD_SAFE_
+
+#include <bits/libc-lock.h>
+#include <bits/libc-tsd.h>
+
+
+/* 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;
+
+/*
+ * Task-variable destructor
+ */
+void
+__rpc_thread_destroy (void)
+{
+	struct rpc_thread_variables *tvp = __rpc_thread_variables();
+
+	if (tvp != NULL && tvp != &__libc_tsd_RPC_VARS_mem) {
+		__rpc_thread_svc_cleanup ();
+		__rpc_thread_clnt_cleanup ();
+		__rpc_thread_key_cleanup ();
+		free (tvp->authnone_private_s);
+		free (tvp->clnt_perr_buf_s);
+		free (tvp->clntraw_private_s);
+		free (tvp->svcraw_private_s);
+		free (tvp->authdes_cache_s);
+		free (tvp->authdes_lru_s);
+		free (tvp);
+	}
+}
+
+
+/*
+ * Initialize RPC multi-threaded operation
+ */
+static void
+rpc_thread_multi (void)
+{
+  __libc_tsd_set (RPC_VARS, &__libc_tsd_RPC_VARS_mem);
+}
+
+
+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) {
+		__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 == &__libc_tsd_RPC_VARS_mem)
+		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 == &__libc_tsd_RPC_VARS_mem)
+		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 == &__libc_tsd_RPC_VARS_mem)
+		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 == &__libc_tsd_RPC_VARS_mem)
+		return &svc_max_pollfd;
+	return &tvp->svc_max_pollfd_s;
+}
+#else
+
+fd_set * __rpc_thread_svc_fdset (void)
+{
+    extern fd_set svc_fdset;
+    return &(svc_fdset);
+}
+
+struct rpc_createerr * __rpc_thread_createerr (void)
+{
+    extern struct rpc_createerr rpc_createerr;
+    return &(rpc_createerr);
+}
+
+struct pollfd ** __rpc_thread_svc_pollfd (void)
+{
+    extern struct pollfd *svc_pollfd;
+    return &(svc_pollfd);
+}
+
+int * __rpc_thread_svc_max_pollfd (void)
+{
+    extern int svc_max_pollfd;
+    return &(svc_max_pollfd);
+}
+
+#endif /* _RPC_THREAD_SAFE_ */