diff options
| author | mckusick <mckusick@FreeBSD.org> | 2010-04-28 05:33:59 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2010-04-28 05:33:59 +0000 |
| commit | 3a0f5972a0de87aebef1af257922515700da4217 (patch) | |
| tree | a65d36ab57a1e076de7e7a1d78add642fbd7062e /lib/libc/rpc/rpc_generic.c | |
| parent | f40c3a9dc50f808e512fcc9f9f738717013b483b (diff) | |
| parent | a768cbcadec7189b9947e9f3cde39fe806bbc1d7 (diff) | |
| download | FreeBSD-src-3a0f5972a0de87aebef1af257922515700da4217.zip FreeBSD-src-3a0f5972a0de87aebef1af257922515700da4217.tar.gz | |
Update to current version of head.
Diffstat (limited to 'lib/libc/rpc/rpc_generic.c')
| -rw-r--r-- | lib/libc/rpc/rpc_generic.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c index 81bd92b..ab259d5 100644 --- a/lib/libc/rpc/rpc_generic.c +++ b/lib/libc/rpc/rpc_generic.c @@ -221,6 +221,18 @@ getnettype(nettype) return (_rpctypelist[i].type); } +static thread_key_t tcp_key, udp_key; +static once_t keys_once = ONCE_INITIALIZER; +static int tcp_key_error, udp_key_error; + +static void +keys_init(void) +{ + + tcp_key_error = thr_keycreate(&tcp_key, free); + udp_key_error = thr_keycreate(&udp_key, free); +} + /* * For the given nettype (tcp or udp only), return the first structure found. * This should be freed by calling freenetconfigent() @@ -236,25 +248,15 @@ __rpc_getconfip(nettype) static char *netid_udp_main; struct netconfig *dummy; int main_thread; - static thread_key_t tcp_key, udp_key; if ((main_thread = thr_main())) { netid_udp = netid_udp_main; netid_tcp = netid_tcp_main; } else { - if (tcp_key == 0) { - mutex_lock(&tsd_lock); - if (tcp_key == 0) - thr_keycreate(&tcp_key, free); - mutex_unlock(&tsd_lock); - } + if (thr_once(&keys_once, keys_init) != 0 || + tcp_key_error != 0 || udp_key_error != 0) + return (NULL); netid_tcp = (char *)thr_getspecific(tcp_key); - if (udp_key == 0) { - mutex_lock(&tsd_lock); - if (udp_key == 0) - thr_keycreate(&udp_key, free); - mutex_unlock(&tsd_lock); - } netid_udp = (char *)thr_getspecific(udp_key); } if (!netid_udp && !netid_tcp) { |
