From c12aa8015699d66a193c3c183b4f1d1a72bb92c1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 23 Aug 2001 06:03:42 +0000 Subject: * 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. --- elf/dl-open.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'elf/dl-open.c') diff --git a/elf/dl-open.c b/elf/dl-open.c index 2f4c97b3c0..9d21a5045c 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -58,15 +58,6 @@ extern int _dl_lazy; /* Do we do lazy relocations? */ static void show_scope (struct link_map *new); #endif -/* 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) - extern size_t _dl_platformlen; /* We must be carefull not to leave us in an inconsistent state. Thus we @@ -349,7 +340,7 @@ _dl_open (const char *file, int mode, const void *caller) _dl_signal_error (EINVAL, file, N_("invalid mode for dlopen()")); /* Make sure we are alone. */ - __libc_lock_lock (_dl_load_lock); + __libc_lock_lock_recursive (_dl_load_lock); args.file = file; args.mode = mode; @@ -363,7 +354,7 @@ _dl_open (const char *file, int mode, const void *caller) #endif /* Release the lock. */ - __libc_lock_unlock (_dl_load_lock); + __libc_lock_unlock_recursive (_dl_load_lock); if (errstring) { -- cgit 1.4.1