summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-09-05 01:43:20 +0000
committerUlrich Drepper <drepper@redhat.com>1997-09-05 01:43:20 +0000
commit26b4d7667169f8db26fd8194b3c498ec58e50f90 (patch)
tree491a6edd9fe8961fe781a50c39517dae8a35321d /elf
parent800d775e426b9c0af63f711b79b09bf540c97456 (diff)
1997-09-05 03:15 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Reorganize order so that nss follows add-ons. * config.make.in (LDAP): Add. * configure.in: Prepare for ldap add-on. * shlib-versions: Add version numbers for ldap NSS module. * nss/Makefile: Add rules to build ldap NSS module. * db/btree/bt_page.c (__bt_free): Update meta data information. Update db from db-2.3.6. * db2/db.h: Updated. * db2/btree/bt_close.c: Updated. * db2/btree/bt_compare.c: Updated. * db2/btree/bt_conv.c: Updated. * db2/btree/bt_cursor.c: Updated. * db2/btree/bt_delete.c: Updated. * db2/btree/bt_put.c: Updated. * db2/btree/bt_rec.c: Updated. * db2/btree/bt_recno.c: Updated. * db2/btree/bt_search.c: Updated. * db2/btree/bt_split.c: Updated. * db2/btree/bt_stat.c: Updated. * db2/common/db_appinit.c: Updated. * db2/common/db_apprec.c: Updated. * db2/common/db_byteorder.c: Updated. * db2/common/db_err.c: Updated. * db2/common/db_region.c: Updated. * db2/db/db.c: Updated. * db2/db/db_conv.c: Updated. * db2/db/db_dup.c: Updated. * db2/db/db_pr.c: Updated. * db2/db/db_ret.c: Updated. * db2/db185/db185.c: Updated. * db2/dbm/dbm.c: Updated. * db2/hash/hash_dup.c: Updated. * db2/include/db_am.h: Updated. * db2/include/db_page.h: Updated. * db2/include/mp.h: Updated. * db2/include/queue.h: Updated. * db2/log/log.c: Updated. * db2/log/log_findckp.c: Updated. * db2/log/log_get.c: Updated. * db2/log/log_rec.c: Updated. * db2/mp/mp_bh.c: Updated. * db2/mp/mp_fopen.c: Updated. * db2/mp/mp_pr.c: Updated. * db2/mp/mp_sync.c: Updated. * db2/mutex/x86.gcc: Updated. * db2/os/db_os_dir.c: Updated. * db2/os/db_os_fid.c: Updated. * db2/progs/db_archive/db_archive.c: Updated. * db2/progs/db_checkpoint/db_checkpoint.c: Updated. * db2/progs/db_deadlock/db_deadlock.c: Updated. * db2/progs/db_dump/db_dump.c: Updated. * db2/progs/db_dump185/db_dump185.c: Updated. * db2/progs/db_load/db_load.c: Updated. * db2/progs/db_printlog/db_printlog.c: Updated. * db2/progs/db_recover/db_recover.c: Updated. * db2/progs/db_stat/db_stat.c: Updated. * db2/txn/txn.c: Updated. * db2/txn/txn_rec.c: Updated. * db2/Makefile: Add rule to build db_printlog. * db2/config.h: Don't include endian.h and don't define WORDS_BIGENDIAN. Only define HAVE_ENDIAN_H. * elf/dl-open.c (_dl_open): Make thread-safe. * elf/dl-close.c (_dl_close): Likewise. * elf/dlclose.c: Pretty print. * elf/dl-version.c (make_string): Use __strdup not strdup. (find_needed): Don't use l_searchlist of _dl_loaded, use the l_next list. * elf/dl-deps.c (_dl_map_object_deps): Remove variable head. * manual/math.texi: Add note about == and != for FP values. * manual/message.texi: Mention problems with relative paths and binstextdomain. * manual/string.texi: Mark strdupa and strndupa correctly as macros. * sunrpc/Makefile (CFLAGS-xkey_prot.c): Define to prevent warnings. * sunrpc/rpc_cout.c: Avoid needless races around return value. * sysdeps/generic/stpcpy.c: Include <config.h> if wanted. Update from tzdata-1997h. * time/africa: Updated. * time/europe: Updated. * time/iso3166.tab: Updated. * time/northamerica: Updated. * time/southamerica: Updated. * time/zone.tab: Updated. 1997-09-04 13:19 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/w_sqrt.S: Removed. * sysdeps/alpha/fpu/e_sqrt.c: New. Obey -mieee and -mieee-with-inexact and build a version that is as fast as possible given the constraint. 1997-08-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/maint.texi: Document some defaults for configuration parameters. 1997-09-04 15:57 Ulrich Drepper <drepper@cygnus.com> * termios/cfsetspeed.c (cfsetspeed): Change return value to int. * termios/termios.h: Change prototype accordingly. Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>. 1997-07-26 14:42 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/stdfiles.c (_libio_using_thunks): Define if _G_USING_THUNKS is defined. * libio/_G_config.h: Moved to ... * sysdeps/generic/_G_config.h: ...here. * sysdeps/unix/sysv/linux/_G_config.h: New, Add vtable thunks support. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/Makefile (pic-ccflag): Override it for more efficient code (together with a change in gcc). * Makeconfig (pic-ccflag): New variable. (CFLAGS-.os): Use it instead of hardcoding -fPIC. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use _dl_start instead of a local label, to avoid getting an unreadable label name. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/Makefile ($(objpfx)libnss_db.so): Use $(dbobjdir) to find libdb.so. * Makeconfig (dbobjdir): Use db2. 1997-08-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/maint.texi (Porting to Unix): Update description of the implementation of Unix system calls. (Contributors): Use real umlaut in tege's name. 1997-08-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/w_gamma.c: Make compilable with _IEEE_LIBM. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-close.c23
-rw-r--r--elf/dl-deps.c11
-rw-r--r--elf/dl-open.c25
-rw-r--r--elf/dl-version.c9
-rw-r--r--elf/dlclose.c4
5 files changed, 53 insertions, 19 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c
index 7e851cd0af..fa9e92cb9f 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -1,5 +1,5 @@
-/* _dl_close -- Close a shared object opened by `_dl_open'.
- Copyright (C) 1996 Free Software Foundation, Inc.
+/* Close a shared object opened by `_dl_open'.
+ Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,8 +23,14 @@
#include <string.h>
#include <sys/types.h>
#include <sys/mman.h>
+#include <libc-lock.h>
+/* During the program run we must not modify the global data of
+ loaded shared object simultanously in two threads. Therefore we
+ protect `dlopen' and `dlclose' in dlclose.c. */
+__libc_lock_define (extern, _dl_load_lock)
+
#define LOSE(s) _dl_signal_error (0, map->l_name, s)
void
@@ -36,10 +42,16 @@ _dl_close (struct link_map *map)
if (map->l_opencount == 0)
LOSE ("shared object not open");
+ /* Acquire the lock. */
+ __libc_lock_lock (_dl_load_lock);
+
/* Decrement the reference count. */
if (--map->l_opencount > 0 || map->l_type != lt_loaded)
- /* There are still references to this object. Do nothing more. */
- return;
+ {
+ /* There are still references to this object. Do nothing more. */
+ __libc_lock_unlock (_dl_load_lock);
+ return;
+ }
/* Notify the debugger we are about to remove some loaded objects. */
_r_debug.r_state = RT_DELETE;
@@ -114,4 +126,7 @@ _dl_close (struct link_map *map)
/* Notify the debugger those objects are finalized and gone. */
_r_debug.r_state = RT_CONSISTENT;
_dl_debug_state ();
+
+ /* Release the lock. */
+ __libc_lock_unlock (_dl_load_lock);
}
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 38db7677b0..27de231dff 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -84,7 +84,7 @@ _dl_map_object_deps (struct link_map *map,
int trace_mode)
{
struct list known[1 + npreloads + 1];
- struct list *runp, *head, *utail, *dtail;
+ struct list *runp, *utail, *dtail;
unsigned int nlist, nduplist, i;
inline void preload (struct link_map *map)
@@ -116,9 +116,6 @@ _dl_map_object_deps (struct link_map *map,
known[nlist - 1].unique = NULL;
known[nlist - 1].dup = NULL;
- /* Pointer to the first member of the unique and duplicate list. */
- head = known;
-
/* Pointer to last unique object. */
utail = &known[nlist - 1];
/* Pointer to last loaded object. */
@@ -300,7 +297,7 @@ _dl_map_object_deps (struct link_map *map,
situation is really not that frequent. So
we don't use a double-linked list but
instead search for the preceding element. */
- late = head;
+ late = known;
while (late->unique != orig)
late = late->unique;
late->unique = newp;
@@ -361,7 +358,7 @@ _dl_map_object_deps (struct link_map *map,
"cannot allocate symbol search list");
map->l_nsearchlist = nlist;
- for (nlist = 0, runp = head; runp; runp = runp->unique)
+ for (nlist = 0, runp = known; runp; runp = runp->unique)
{
map->l_searchlist[nlist++] = runp->map;
@@ -380,7 +377,7 @@ _dl_map_object_deps (struct link_map *map,
_dl_signal_error (ENOMEM, map->l_name,
"cannot allocate symbol search list");
- for (nlist = 0, runp = head; runp; runp = runp->dup)
+ for (nlist = 0, runp = known; runp; runp = runp->dup)
map->l_dupsearchlist[nlist++] = runp->map;
}
}
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 529806cc36..113e472165 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -21,6 +21,7 @@
#include <dlfcn.h>
#include <stdlib.h>
#include <errno.h>
+#include <libc-lock.h>
extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
@@ -38,6 +39,17 @@ extern char **__environ;
size_t _dl_global_scope_alloc;
+
+/* During the program run we must not modify the global data of
+ loaded shared object simultanously in two threads. Therefore we
+ protect `_dl_open' and `_dl_close' in dl-close.c.
+
+ This must be a recursive lock since the initializer function of
+ the loaded object might as well require a call to this function.
+ At this time it is not anymore a problem to modify the tables. */
+__libc_lock_define_initialized_recursive (, _dl_load_lock)
+
+
struct link_map *
_dl_open (const char *file, int mode)
{
@@ -45,11 +57,17 @@ _dl_open (const char *file, int mode)
ElfW(Addr) init;
struct r_debug *r;
+ /* Make sure we are alone. */
+ __libc_lock_lock (_dl_load_lock);
+
/* Load the named object. */
new = _dl_map_object (NULL, file, lt_loaded, 0);
if (new->l_searchlist)
- /* It was already open. */
- return new;
+ {
+ /* It was already open. */
+ __libc_lock_unlock (_dl_load_lock);
+ return new;
+ }
/* Load that object's dependencies. */
_dl_map_object_deps (new, NULL, 0, 0);
@@ -152,5 +170,8 @@ _dl_open (const char *file, int mode)
has loaded a dynamic object now has competition. */
__libc_multiple_libcs = 1;
+ /* Release the lock. */
+ __libc_lock_unlock (_dl_load_lock);
+
return new;
}
diff --git a/elf/dl-version.c b/elf/dl-version.c
index b5515c86e0..0f98dd057c 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -46,7 +46,7 @@ extern char **_dl_argv;
\
cp = result = alloca (len); \
for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt) \
- cp = stpcpy (cp, all[cnt]); \
+ cp = __stpcpy (cp, all[cnt]); \
\
result; \
})
@@ -55,11 +55,12 @@ extern char **_dl_argv;
static inline struct link_map *
find_needed (const char *name, struct link_map *map)
{
+ struct link_map *tmap;
unsigned int n;
- for (n = 0; n < _dl_loaded->l_nsearchlist; ++n)
- if (_dl_name_match_p (name, _dl_loaded->l_searchlist[n]))
- return _dl_loaded->l_searchlist[n];
+ for (tmap = _dl_loaded; tmap != NULL; tmap = tmap->l_next)
+ if (_dl_name_match_p (name, tmap))
+ return tmap;
/* The required object is not in the global scope, look to see if it is
a dependency of the current object. */
diff --git a/elf/dlclose.c b/elf/dlclose.c
index d96ffc9cc1..a2ec750baf 100644
--- a/elf/dlclose.c
+++ b/elf/dlclose.c
@@ -1,5 +1,5 @@
-/* dlclose -- Close a handle opened by `dlopen'.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Close a handle opened by `dlopen'.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or