#ifndef _RPC_RPC_H
#include <sunrpc/rpc/rpc.h>
+#include <bits/libc-tsd.h>
/* Now define the internal interfaces. */
extern unsigned long _create_xid (void);
extern void __rpc_thread_key_cleanup (void);
extern void __rpc_thread_destroy (void);
+#if USE_TLS && HAVE___THREAD
+__libc_tsd_define (extern, RPC_VARS)
+#endif
#define RPC_THREAD_VARIABLE(x) (__rpc_thread_variables()->x)
+libc_hidden_proto (__rpc_thread_svc_fdset)
+libc_hidden_proto (__rpc_thread_createerr)
+
#endif /* _RPC_THREAD_SAFE_ */
#endif
+2002-08-02 Ulrich Drepper <drepper@redhat.com>
+
+ * cancel.c (__pthread_perform_cleanup) [USE_TLS && HAVE___THREAD]:
+ Don't use p_libc_specific element in thread descriptor.
+
2002-07-30 Roland McGrath <roland@redhat.com>
* sysdeps/pthread/bits/libc-tsd.h: Include <tls.h>.
}
/* And the TSD which needs special help. */
+#if !(USE_TLS && HAVE___THREAD)
if (THREAD_GETMEM(self, p_libc_specific[_LIBC_TSD_KEY_RPC_VARS]) != NULL)
__rpc_thread_destroy ();
+#else
+ if (__libc_tsd_get (RPC_VARS) != NULL)
+ __rpc_thread_destroy ();
+#endif
}
#ifndef SHARED
-/* Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996.
char linebuffer[0];
} *host_data = (struct host_data *) buffer;
querybuf host_buffer;
- char qbuf[MAXDNAME+1], *qp;
+ char qbuf[MAXDNAME+1], *qp = NULL;
size_t size;
int n, status;
}
GLIBC_PRIVATE {
# needed by libpthread.
- __rpc_thread_destroy;
+ __rpc_thread_destroy; __libc_tsd_RPC_VARS;
}
}
/* Variable used in non-threaded applications or for the first thread. */
static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
+#if USE_TLS && HAVE___THREAD
+__libc_tsd_define (, RPC_VARS)
+#else
__libc_tsd_define (static, RPC_VARS)
+#endif
/*
* Task-variable destructor
return &svc_fdset;
return &tvp->svc_fdset_s;
}
+libc_hidden_def (__rpc_thread_svc_fdset)
struct rpc_createerr *
__rpc_thread_createerr (void)
return &rpc_createerr;
return &tvp->rpc_createerr_s;
}
+libc_hidden_def (__rpc_thread_createerr)
struct pollfd **
__rpc_thread_svc_pollfd (void)