mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 09:01:07 +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.
240 lines
6.9 KiB
C
240 lines
6.9 KiB
C
/* Handle loading/unloading of shared object for transformation.
|
|
Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <assert.h>
|
|
#include <dlfcn.h>
|
|
#include <inttypes.h>
|
|
#include <search.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <libc-lock.h>
|
|
#include <sys/param.h>
|
|
|
|
#include <gconv_int.h>
|
|
#include <sysdep.h>
|
|
|
|
|
|
#ifdef DEBUG
|
|
/* For debugging purposes. */
|
|
static void print_all (void);
|
|
#endif
|
|
|
|
|
|
/* This is a tuning parameter. If a transformation module is not used
|
|
anymore it gets not immediately unloaded. Instead we wait a certain
|
|
number of load attempts for further modules. If none of the
|
|
subsequent load attempts name the same object it finally gets unloaded.
|
|
Otherwise it is still available which hopefully is the frequent case.
|
|
The following number is the number of unloading attempts we wait
|
|
before unloading. */
|
|
#define TRIES_BEFORE_UNLOAD 2
|
|
|
|
/* Array of loaded objects. This is shared by all threads so we have
|
|
to use semaphores to access it. */
|
|
static void *loaded;
|
|
|
|
/* Comparison function for searching `loaded_object' tree. */
|
|
static int
|
|
known_compare (const void *p1, const void *p2)
|
|
{
|
|
const struct __gconv_loaded_object *s1 =
|
|
(const struct __gconv_loaded_object *) p1;
|
|
const struct __gconv_loaded_object *s2 =
|
|
(const struct __gconv_loaded_object *) p2;
|
|
|
|
return strcmp (s1->name, s2->name);
|
|
}
|
|
|
|
/* Open the gconv database if necessary. A non-negative return value
|
|
means success. */
|
|
struct __gconv_loaded_object *
|
|
internal_function
|
|
__gconv_find_shlib (const char *name)
|
|
{
|
|
struct __gconv_loaded_object *found;
|
|
void *keyp;
|
|
|
|
/* Search the tree of shared objects previously requested. Data in
|
|
the tree are `loaded_object' structures, whose first member is a
|
|
`const char *', the lookup key. The search returns a pointer to
|
|
the tree node structure; the first member of the is a pointer to
|
|
our structure (i.e. what will be a `loaded_object'); since the
|
|
first member of that is the lookup key string, &FCT_NAME is close
|
|
enough to a pointer to our structure to use as a lookup key that
|
|
will be passed to `known_compare' (above). */
|
|
|
|
keyp = __tfind (&name, &loaded, known_compare);
|
|
if (keyp == NULL)
|
|
{
|
|
/* This name was not known before. */
|
|
size_t namelen = strlen (name) + 1;
|
|
|
|
found = malloc (sizeof (struct __gconv_loaded_object) + namelen);
|
|
if (found != NULL)
|
|
{
|
|
/* Point the tree node at this new structure. */
|
|
found->name = (char *) memcpy (found + 1, name, namelen);
|
|
found->counter = -TRIES_BEFORE_UNLOAD - 1;
|
|
found->handle = NULL;
|
|
|
|
if (__builtin_expect (__tsearch (found, &loaded, known_compare)
|
|
== NULL, 0))
|
|
{
|
|
/* Something went wrong while inserting the entry. */
|
|
free (found);
|
|
found = NULL;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
found = *(struct __gconv_loaded_object **) keyp;
|
|
|
|
/* Try to load the shared object if the usage count is 0. This
|
|
implies that if the shared object is not loadable, the handle is
|
|
NULL and the usage count > 0. */
|
|
if (found != NULL)
|
|
{
|
|
if (found->counter < -TRIES_BEFORE_UNLOAD)
|
|
{
|
|
assert (found->handle == NULL);
|
|
found->handle = __libc_dlopen (found->name);
|
|
if (found->handle != NULL)
|
|
{
|
|
found->fct = __libc_dlsym (found->handle, "gconv");
|
|
if (found->fct == NULL)
|
|
{
|
|
/* Argh, no conversion function. There is something
|
|
wrong here. */
|
|
__gconv_release_shlib (found);
|
|
found = NULL;
|
|
}
|
|
else
|
|
{
|
|
found->init_fct = __libc_dlsym (found->handle, "gconv_init");
|
|
found->end_fct = __libc_dlsym (found->handle, "gconv_end");
|
|
|
|
#ifdef PTR_MANGLE
|
|
PTR_MANGLE (found->fct);
|
|
if (found->init_fct != NULL)
|
|
PTR_MANGLE (found->init_fct);
|
|
if (found->end_fct != NULL)
|
|
PTR_MANGLE (found->end_fct);
|
|
#endif
|
|
|
|
/* We have succeeded in loading the shared object. */
|
|
found->counter = 1;
|
|
}
|
|
}
|
|
else
|
|
/* Error while loading the shared object. */
|
|
found = NULL;
|
|
}
|
|
else if (found->handle != NULL)
|
|
found->counter = MAX (found->counter + 1, 1);
|
|
}
|
|
|
|
return found;
|
|
}
|
|
|
|
|
|
/* This is very ugly but the tsearch functions provide no way to pass
|
|
information to the walker function. So we use a global variable.
|
|
It is MT safe since we use a lock. */
|
|
static struct __gconv_loaded_object *release_handle;
|
|
|
|
static void
|
|
do_release_shlib (void *nodep, VISIT value, int level)
|
|
{
|
|
struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
|
|
|
|
if (value != preorder && value != leaf)
|
|
return;
|
|
|
|
if (obj == release_handle)
|
|
{
|
|
/* This is the object we want to unload. Now decrement the
|
|
reference counter. */
|
|
assert (obj->counter > 0);
|
|
--obj->counter;
|
|
}
|
|
else if (obj->counter <= 0 && obj->counter >= -TRIES_BEFORE_UNLOAD
|
|
&& --obj->counter < -TRIES_BEFORE_UNLOAD && obj->handle != NULL)
|
|
{
|
|
/* Unload the shared object. */
|
|
__libc_dlclose (obj->handle);
|
|
obj->handle = NULL;
|
|
}
|
|
}
|
|
|
|
|
|
/* Notify system that a shared object is not longer needed. */
|
|
void
|
|
internal_function
|
|
__gconv_release_shlib (struct __gconv_loaded_object *handle)
|
|
{
|
|
/* Urgh, this is ugly but we have no other possibility. */
|
|
release_handle = handle;
|
|
|
|
/* Process all entries. Please note that we also visit entries
|
|
with release counts <= 0. This way we can finally unload them
|
|
if necessary. */
|
|
__twalk (loaded, (__action_fn_t) do_release_shlib);
|
|
}
|
|
|
|
|
|
/* We run this if we debug the memory allocation. */
|
|
static void __libc_freeres_fn_section
|
|
do_release_all (void *nodep)
|
|
{
|
|
struct __gconv_loaded_object *obj = (struct __gconv_loaded_object *) nodep;
|
|
|
|
/* Unload the shared object. */
|
|
if (obj->handle != NULL)
|
|
__libc_dlclose (obj->handle);
|
|
|
|
free (obj);
|
|
}
|
|
|
|
libc_freeres_fn (free_mem)
|
|
{
|
|
__tdestroy (loaded, do_release_all);
|
|
loaded = NULL;
|
|
}
|
|
|
|
|
|
#ifdef DEBUG
|
|
static void
|
|
do_print (const void *nodep, VISIT value, int level)
|
|
{
|
|
struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
|
|
|
|
printf ("%10s: \"%s\", %d\n",
|
|
value == leaf ? "leaf" :
|
|
value == preorder ? "preorder" :
|
|
value == postorder ? "postorder" : "endorder",
|
|
obj->name, obj->counter);
|
|
}
|
|
|
|
static void
|
|
print_all (void)
|
|
{
|
|
__twalk (loaded, do_print);
|
|
}
|
|
#endif
|