mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 01:00:10 +00:00
7a68c94a5b
1998-07-10 18:14 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * manual/Makefile: Overhauled. Generate libc.texinfo from the chapter files. Exorcise the chapters, chapters-incl mess. Support inserting doc chapters from add-on modules. (chapters): New variable. (add-chapters): New variable. (appendices): New variable. (libc.texinfo): New target. (clean): Fix bugs. (realclean): Fix bugs. * manual/texis.awk: New file. * manual/libc-texinfo.sh: New file. * manual/libc-texinfo.in: New file. * manual/conf.texi (top @node): Remove next pointer. * manual/lang.texi (top @node): Remove prev pointer. * manual/job.texi (top @node): Add explicit pointers. * manual/message.texi (top @node): Add explicit pointers. * manual/nss.texi (top @node): Add explicit pointers. * manual/process.texi (top @node): Add explicit pointers. * manual/startup.texi (top @node): Add explicit pointers. * manual/terminal.texi (top @node): Add explicit pointers. * manual/users.texi (top @node): Add explicit pointers. * manual/arith.texi: Add %MENU% tag. * manual/conf.texi: Add %MENU% tag. * manual/contrib.texi: Add %MENU% tag. * manual/ctype.texi: Add %MENU% tag. * manual/errno.texi: Add %MENU% tag. * manual/filesys.texi: Add %MENU% tag. * manual/header.texi: Add %MENU% tag. * manual/install.texi: Add %MENU% tag. * manual/intro.texi: Add %MENU% tag. * manual/io.texi: Add %MENU% tag. * manual/job.texi: Add %MENU% tag. * manual/lang.texi: Add %MENU% tag. * manual/llio.texi: Add %MENU% tag. * manual/locale.texi: Add %MENU% tag. * manual/maint.texi: Add %MENU% tag. * manual/math.texi: Add %MENU% tag. * manual/mbyte.texi: Add %MENU% tag. * manual/memory.texi: Add %MENU% tag. * manual/message.texi: Add %MENU% tag. * manual/nss.texi: Add %MENU% tag. * manual/pattern.texi: Add %MENU% tag. * manual/pipe.texi: Add %MENU% tag. * manual/process.texi: Add %MENU% tag. * manual/search.texi: Add %MENU% tag. * manual/setjmp.texi: Add %MENU% tag. * manual/signal.texi: Add %MENU% tag. * manual/socket.texi: Add %MENU% tag. * manual/startup.texi: Add %MENU% tag. * manual/stdio.texi: Add %MENU% tag. * manual/string.texi: Add %MENU% tag. * manual/sysinfo.texi: Add %MENU% tag. * manual/terminal.texi: Add %MENU% tag. * manual/time.texi: Add %MENU% tag. * manual/users.texi: Add %MENU% tag. 1998-07-13 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Update. 1998-07-11 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/recvmsg.c (__libc_recvmsg): Use ANSI style declaration to avoid warning. * sysdeps/unix/sysv/linux/sendmsg.c (__libc_sendmsg): Likewise. 1998-07-04 Mark Kettenis <kettenis@phys.uva.nl> * elf/rtld.c (process_dl_debug): Add missing continue. 1998-07-12 Mark Kettenis <kettenis@phys.uva.nl> * elf/rtld.c (_dl_skip_args): Make global because the Hurd startup code needs it. 1998-07-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig ($(common-objpfx)sysd-dirs): Write out definition of sysd-dirs-done. * Makerules: Don't generate version maps too early. ($(common-objpfx)sysd-versions): Force regeneration if the list of subdirs has changed. 1998-07-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dlfcn.h (DL_CALL_FCT): Use portable comma expression. 1998-07-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * iconv/gconv_db.c (gen_steps): Always set *handle and *nsteps. * iconv/gconv_dl.c (__gconv_find_shlib): Correct use of tfind return value. 1998-07-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-open.c (dl_open_worker): New function. (_dl_open): Call it to do the actual work while catching errors. * elf/dl-close.c (_dl_close): Only call termination function if the initialisation function was called. 1998-07-13 Ulrich Drepper <drepper@cygnus.com> * libio/libioP.h (_IO_cleanup_registration_needed): Use __PMT. Reported by Felix von Leitner <leitner@amdiv.de>. 1998-07-13 10:28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/rtld.c (process_dl_debug): Add missing continue. 1998-06-23 Mark Kettenis <kettenis@phys.uva.nl>
253 lines
7.0 KiB
C
253 lines
7.0 KiB
C
/* Handle loading/unloading of shared object for transformation.
|
|
Copyright (C) 1997, 1998 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <inttypes.h>
|
|
#include <search.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <elf/ldsodefs.h>
|
|
#include <sys/param.h>
|
|
|
|
#include <gconv_int.h>
|
|
|
|
|
|
/* 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 (intptr_t) s1->handle - (intptr_t) s2->handle;
|
|
}
|
|
|
|
|
|
static void
|
|
do_open (void *a)
|
|
{
|
|
struct gconv_loaded_object *args = (struct gconv_loaded_object *) a;
|
|
/* Open and relocate the shared object. */
|
|
args->handle = _dl_open (args->name, RTLD_LAZY);
|
|
}
|
|
|
|
|
|
static int
|
|
internal_function
|
|
dlerror_run (void (*operate) (void *), void *args)
|
|
{
|
|
char *last_errstring = NULL;
|
|
int result;
|
|
|
|
(void) _dl_catch_error (&last_errstring, operate, args);
|
|
|
|
result = last_errstring != NULL;
|
|
if (result)
|
|
free (last_errstring);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
struct get_sym_args
|
|
{
|
|
/* Arguments to get_sym. */
|
|
struct link_map *map;
|
|
const char *name;
|
|
|
|
/* Return values of get_sym. */
|
|
ElfW(Addr) loadbase;
|
|
const ElfW(Sym) *ref;
|
|
};
|
|
|
|
static void
|
|
get_sym (void *a)
|
|
{
|
|
struct get_sym_args *args = (struct get_sym_args *) a;
|
|
struct link_map *scope[2] = { args->map, NULL };
|
|
args->ref = NULL;
|
|
args->loadbase = _dl_lookup_symbol (args->name, &args->ref,
|
|
scope, args->map->l_name, 0);
|
|
}
|
|
|
|
|
|
void *
|
|
internal_function
|
|
__gconv_find_func (void *handle, const char *name)
|
|
{
|
|
struct get_sym_args args;
|
|
|
|
args.map = handle;
|
|
args.name = name;
|
|
|
|
return (dlerror_run (get_sym, &args) ? NULL
|
|
: (void *) (args.loadbase + args.ref->st_value));
|
|
}
|
|
|
|
|
|
|
|
/* 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. */
|
|
found = malloc (sizeof (struct gconv_loaded_object));
|
|
if (found != NULL)
|
|
{
|
|
/* Point the tree node at this new structure. */
|
|
found->name = name;
|
|
found->counter = -TRIES_BEFORE_UNLOAD - 1;
|
|
found->handle = NULL;
|
|
|
|
if (__tsearch (found, &loaded, known_compare) == NULL)
|
|
{
|
|
/* 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)
|
|
{
|
|
if (dlerror_run (do_open, found) == 0)
|
|
{
|
|
found->fct = __gconv_find_func (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 = __gconv_find_func (found->handle,
|
|
"gconv_init");
|
|
found->end_fct = __gconv_find_func (found->handle,
|
|
"gconv_end");
|
|
|
|
/* 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 (const 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 set the release
|
|
counter to zero. */
|
|
obj->counter = 0;
|
|
else if (obj->counter <= 0)
|
|
{
|
|
if (--obj->counter < -TRIES_BEFORE_UNLOAD && obj->handle != NULL)
|
|
{
|
|
/* Unload the shared object. We don't use the trick to
|
|
catch errors since in the case an error is signalled
|
|
something is really wrong. */
|
|
_dl_close (obj->handle);
|
|
|
|
obj->handle = NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* Notify system that a shared object is not longer needed. */
|
|
int
|
|
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, do_release_shlib);
|
|
|
|
return GCONV_OK;
|
|
}
|