diff options
| author | Roland McGrath <roland@gnu.org> | 2001-08-23 06:03:42 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2001-08-23 06:03:42 +0000 |
| commit | c12aa8015699d66a193c3c183b4f1d1a72bb92c1 (patch) | |
| tree | a20c1864b74c8471aa7aaf675da180546b16c537 /elf/dl-lookup.c | |
| parent | 8179dcc10808cf2a515cf19d445789193a763ec4 (diff) | |
| download | glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.zip glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.tar.gz glibc-c12aa8015699d66a193c3c183b4f1d1a72bb92c1.tar.bz2 | |
* sysdeps/generic/ldsodefs.h (_dl_load_lock): Declare it here with
__libc_lock_define_recursive.
* elf/dl-open.c: Don't declare it here any more.
* elf/dl-close.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-iteratephdr.c: Likewise.
* elf/dl-lookup.c (add_dependency): Use __libc_lock_lock_recursive and
__libc_lock_unlock_recursive.
* elf/dl-close.c (_dl_close): Likewise
* elf/dl-iteratephdr.c (__dl_iterate_phdr): Likewise
* elf/dl-open.c (_dl_open): Likewise
* sysdeps/generic/bits/libc-lock.h
(__libc_lock_define_recursive): New macro.
* sysdeps/generic/bits/stdio-lock.h (_IO_lock_t): Use it.
(_IO_lock_lock): Use __libc_lock_lock_recursive.
(_IO_lock_unlock): Use __libc_lock_unlock_recursive.
Diffstat (limited to 'elf/dl-lookup.c')
| -rw-r--r-- | elf/dl-lookup.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 85b9718..fe833ba 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -61,15 +61,6 @@ struct sym_val /* Statistics function. */ unsigned long int _dl_num_relocations; -/* 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 (extern, _dl_load_lock) - /* We have two different situations when looking up a simple: with or without versioning. gcc is not able to optimize a single function @@ -92,7 +83,7 @@ add_dependency (struct link_map *undef_map, struct link_map *map) int result = 0; /* Make sure nobody can unload the object while we are at it. */ - __libc_lock_lock (_dl_load_lock); + __libc_lock_lock_recursive (_dl_load_lock); /* Determine whether UNDEF_MAP already has a reference to MAP. First look in the normal dependencies. */ @@ -174,7 +165,7 @@ add_dependency (struct link_map *undef_map, struct link_map *map) } /* Release the lock. */ - __libc_lock_unlock (_dl_load_lock); + __libc_lock_unlock_recursive (_dl_load_lock); return result; } |