mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 14:00:30 +00:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
148 lines
5.0 KiB
C
148 lines
5.0 KiB
C
/*
|
||
* Copyright (c) 1995-1999 by Internet Software Consortium.
|
||
*
|
||
* Permission to use, copy, modify, and distribute this software for any
|
||
* purpose with or without fee is hereby granted, provided that the above
|
||
* copyright notice and this permission notice appear in all copies.
|
||
*
|
||
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
||
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
||
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
||
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
||
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||
* SOFTWARE.
|
||
*/
|
||
|
||
#include <atomic.h>
|
||
#include <limits.h>
|
||
#include <sys/types.h>
|
||
#include <netinet/in.h>
|
||
#include <arpa/nameser.h>
|
||
#include <resolv.h>
|
||
#include <libc-lock.h>
|
||
|
||
|
||
/* The following bit is copied from res_data.c (where it is #ifdef'ed
|
||
out) since res_init() should go into libc.so but the rest of that
|
||
file should not. */
|
||
|
||
extern unsigned long long int __res_initstamp attribute_hidden;
|
||
/* We have atomic increment operations on 64-bit platforms. */
|
||
#if __WORDSIZE == 64
|
||
# define atomicinclock(lock) (void) 0
|
||
# define atomicincunlock(lock) (void) 0
|
||
# define atomicinc(var) catomic_increment (&(var))
|
||
#else
|
||
__libc_lock_define_initialized (static, lock);
|
||
# define atomicinclock(lock) __libc_lock_lock (lock)
|
||
# define atomicincunlock(lock) __libc_lock_unlock (lock)
|
||
# define atomicinc(var) ++var
|
||
#endif
|
||
|
||
int
|
||
res_init(void) {
|
||
extern int __res_vinit(res_state, int);
|
||
|
||
/*
|
||
* These three fields used to be statically initialized. This made
|
||
* it hard to use this code in a shared library. It is necessary,
|
||
* now that we're doing dynamic initialization here, that we preserve
|
||
* the old semantics: if an application modifies one of these three
|
||
* fields of _res before res_init() is called, res_init() will not
|
||
* alter them. Of course, if an application is setting them to
|
||
* _zero_ before calling res_init(), hoping to override what used
|
||
* to be the static default, we can't detect it and unexpected results
|
||
* will follow. Zero for any of these fields would make no sense,
|
||
* so one can safely assume that the applications were already getting
|
||
* unexpected results.
|
||
*
|
||
* _res.options is tricky since some apps were known to diddle the bits
|
||
* before res_init() was first called. We can't replicate that semantic
|
||
* with dynamic initialization (they may have turned bits off that are
|
||
* set in RES_DEFAULT). Our solution is to declare such applications
|
||
* "broken". They could fool us by setting RES_INIT but none do (yet).
|
||
*/
|
||
if (!_res.retrans)
|
||
_res.retrans = RES_TIMEOUT;
|
||
if (!_res.retry)
|
||
_res.retry = 4;
|
||
if (!(_res.options & RES_INIT))
|
||
_res.options = RES_DEFAULT;
|
||
else if (_res.nscount > 0)
|
||
__res_iclose (&_res, true); /* Close any VC sockets. */
|
||
|
||
/*
|
||
* This one used to initialize implicitly to zero, so unless the app
|
||
* has set it to something in particular, we can randomize it now.
|
||
*/
|
||
if (!_res.id)
|
||
_res.id = res_randomid();
|
||
|
||
atomicinclock (lock);
|
||
/* Request all threads to re-initialize their resolver states,
|
||
resolv.conf might have changed. */
|
||
atomicinc (__res_initstamp);
|
||
atomicincunlock (lock);
|
||
|
||
return (__res_vinit(&_res, 1));
|
||
}
|
||
|
||
/* Initialize resp if RES_INIT is not yet set or if res_init in some other
|
||
thread requested re-initializing. */
|
||
int
|
||
__res_maybe_init (res_state resp, int preinit)
|
||
{
|
||
if (resp->options & RES_INIT) {
|
||
if (__res_initstamp != resp->_u._ext.initstamp) {
|
||
if (resp->nscount > 0)
|
||
__res_iclose (resp, true);
|
||
return __res_vinit (resp, 1);
|
||
}
|
||
return 0;
|
||
} else if (preinit) {
|
||
if (!resp->retrans)
|
||
resp->retrans = RES_TIMEOUT;
|
||
if (!resp->retry)
|
||
resp->retry = 4;
|
||
resp->options = RES_DEFAULT;
|
||
if (!resp->id)
|
||
resp->id = res_randomid ();
|
||
return __res_vinit (resp, 1);
|
||
} else
|
||
return __res_ninit (resp);
|
||
}
|
||
libc_hidden_def (__res_maybe_init)
|
||
|
||
/* This needs to be after the use of _res in res_init, above. */
|
||
#undef _res
|
||
|
||
/* The resolver state for use by single-threaded programs.
|
||
This differs from plain `struct __res_state _res;' in that it doesn't
|
||
create a common definition, but a plain symbol that resides in .bss,
|
||
which can have an alias. */
|
||
struct __res_state _res __attribute__ ((nocommon));
|
||
|
||
#undef __resp
|
||
__thread struct __res_state *__resp = &_res;
|
||
extern __thread struct __res_state *__libc_resp
|
||
__attribute__ ((alias ("__resp"))) attribute_hidden;
|
||
|
||
/* We declare this with compat_symbol so that it's not
|
||
visible at link time. Programs must use the accessor functions. */
|
||
#ifdef SHARED
|
||
# include <shlib-compat.h>
|
||
compat_symbol (libc, _res, _res, GLIBC_2_0);
|
||
#endif
|
||
|
||
#include <shlib-compat.h>
|
||
|
||
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_2)
|
||
# undef res_init
|
||
extern int __res_init_weak (void);
|
||
weak_extern (__res_init_weak);
|
||
strong_alias (__res_init, __res_init_weak);
|
||
compat_symbol (libc, __res_init_weak, res_init, GLIBC_2_0);
|
||
#endif
|