diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | bits/libc-lock.h | 3 | ||||
| -rw-r--r-- | bits/stdio-lock.h | 15 | ||||
| -rw-r--r-- | elf/dl-close.c | 11 | ||||
| -rw-r--r-- | elf/dl-iteratephdr.c | 6 | ||||
| -rw-r--r-- | elf/dl-lookup.c | 13 | ||||
| -rw-r--r-- | elf/dl-open.c | 13 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 18 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/bits/libc-lock.h | 18 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/bits/stdio-lock.h | 19 | ||||
| -rw-r--r-- | sysdeps/generic/bits/libc-lock.h | 3 | ||||
| -rw-r--r-- | sysdeps/generic/bits/stdio-lock.h | 15 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 11 |
13 files changed, 91 insertions, 72 deletions
@@ -1,5 +1,23 @@ 2001-08-22 Roland McGrath <roland@frob.com> + * 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. + * conform/conformtest.pl (checknamespace): Sort the output list. * sysdeps/generic/bits/poll.h (POLLWRBAND): New alias for POLLOUT. diff --git a/bits/libc-lock.h b/bits/libc-lock.h index ec95e81..ca90d35 100644 --- a/bits/libc-lock.h +++ b/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. Stub version. - Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996,97,99,2000,01 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 @@ -29,6 +29,7 @@ begins with a `*'), because its storage size will not be known outside of libc. */ #define __libc_lock_define(CLASS,NAME) +#define __libc_lock_define_recursive(CLASS,NAME) #define __libc_rwlock_define(CLASS,NAME) /* Define an initialized lock variable NAME with storage class CLASS. */ diff --git a/bits/stdio-lock.h b/bits/stdio-lock.h index 225ccd8..f7c6108 100644 --- a/bits/stdio-lock.h +++ b/bits/stdio-lock.h @@ -22,12 +22,17 @@ #include <bits/libc-lock.h> -__libc_lock_define (typedef, _IO_lock_t) +__libc_lock_define_recursive (typedef, _IO_lock_t) /* We need recursive (counting) mutexes. */ #define _IO_lock_initializer ... #error libio needs recursive mutexes for _IO_MTSAFE_IO +#define _IO_lock_init(_name) __libc_lock_init_recursive (_name) +#define _IO_lock_fini(_name) __libc_lock_fini_recursive (_name) +#define _IO_lock_lock(_name) __libc_lock_lock_recursive (_name) +#define _IO_lock_unlock(_name) __libc_lock_unlock_recursive (_name) + #define _IO_cleanup_region_start(_fct, _fp) \ __libc_cleanup_region_start (_fct, _fp) @@ -35,14 +40,6 @@ __libc_lock_define (typedef, _IO_lock_t) __libc_cleanup_region_start (_fct, NULL) #define _IO_cleanup_region_end(_doit) \ __libc_cleanup_region_end (_doit) -#define _IO_lock_init(_name) \ - __libc_lock_init_recursive (_name) -#define _IO_lock_fini(_name) \ - __libc_lock_fini_recursive (_name) -#define _IO_lock_lock(_name) \ - __libc_lock_lock (_name) -#define _IO_lock_unlock(_name) \ - __libc_lock_unlock (_name) #endif /* bits/stdio-lock.h */ diff --git a/elf/dl-close.c b/elf/dl-close.c index 3d24892..66c88b2 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -32,11 +32,6 @@ typedef void (*fini_t) (void); -/* 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) - void internal_function _dl_close (void *_map) @@ -61,7 +56,7 @@ _dl_close (void *_map) _dl_signal_error (0, map->l_name, N_("shared object not open")); /* Acquire the lock. */ - __libc_lock_lock (_dl_load_lock); + __libc_lock_lock_recursive (_dl_load_lock); /* Decrement the reference count. */ if (map->l_opencount > 1 || map->l_type != lt_loaded) @@ -80,7 +75,7 @@ _dl_close (void *_map) /* One decrement the object itself, not the dependencies. */ --map->l_opencount; - __libc_lock_unlock (_dl_load_lock); + __libc_lock_unlock_recursive (_dl_load_lock); return; } @@ -277,7 +272,7 @@ _dl_close (void *_map) free (list); /* Release the lock. */ - __libc_lock_unlock (_dl_load_lock); + __libc_lock_unlock_recursive (_dl_load_lock); } diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c index fa62dc7..ff11ce5 100644 --- a/elf/dl-iteratephdr.c +++ b/elf/dl-iteratephdr.c @@ -23,8 +23,6 @@ #include <stddef.h> #include <bits/libc-lock.h> -__libc_lock_define (extern, _dl_load_lock) - int __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, size_t size, void *data), void *data) @@ -34,7 +32,7 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, int ret = 0; /* Make sure we are alone. */ - __libc_lock_lock (_dl_load_lock); + __libc_lock_lock_recursive (_dl_load_lock); for (l = _dl_loaded; l != NULL; l = l->l_next) { @@ -51,7 +49,7 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, } /* Release the lock. */ - __libc_lock_unlock (_dl_load_lock); + __libc_lock_unlock_recursive (_dl_load_lock); return ret; } 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; } diff --git a/elf/dl-open.c b/elf/dl-open.c index 2f4c97b..9d21a50 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) { diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index a3c0f77..fcb2e07 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,21 @@ +2001-08-22 Roland McGrath <roland@frob.com> + + * sysdeps/pthread/bits/stdio-lock.h: Include <bits/libc-lock.h> + instead of <pthread.h>. + (_IO_lock_t): Define this typedef using __libc_lock_define_recursive. + (_IO_lock_initializer): Add braces. + (_IO_lock_lock): Use __libc_lock_lock_recursive. + (_IO_lock_unlock): Use __libc_lock_unlock_recursive. + + * sysdeps/pthread/bits/libc-lock.h (__libc_lock_recursive_t): New type. + (__libc_lock_define_initialized_recursive): Use it. + (__libc_lock_init_recursive): Likewise. + (__libc_lock_fini_recursive): Likewise. + (__libc_lock_lock_recursive): Likewise. + (__libc_lock_trylock_recursive): Likewise. + (__libc_lock_unlock_recursive): Likewise. + (__libc_lock_define_recursive): New macro. + 2001-08-14 Jakub Jelinek <jakub@redhat.com> * lockfile.c (__pthread_provide_lockfile): New variable. diff --git a/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/linuxthreads/sysdeps/pthread/bits/libc-lock.h index dbd9cc1..fc68979 100644 --- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h +++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h @@ -26,8 +26,10 @@ #ifdef _LIBC typedef pthread_mutex_t __libc_lock_t; typedef pthread_rwlock_t __libc_rwlock_t; +typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t; #else typedef struct __libc_lock_opaque__ __libc_lock_t; +typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; typedef struct __libc_rwlock_opaque__ __libc_rwlock_t; #endif @@ -45,6 +47,8 @@ typedef pthread_key_t __libc_key_t; CLASS __libc_lock_t NAME; #define __libc_rwlock_define(CLASS,NAME) \ CLASS __libc_rwlock_t NAME; +#define __libc_lock_define_recursive(CLASS,NAME) \ + CLASS __libc_lock_recursive_t NAME; /* Define an initialized lock variable NAME with storage class CLASS. @@ -68,8 +72,8 @@ typedef pthread_key_t __libc_key_t; /* Define an initialized recursive lock variable NAME with storage class CLASS. */ -#define __libc_lock_define_initialized_recursive(CLASS,NAME) \ - CLASS __libc_lock_t NAME = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; +#define __libc_lock_define_initialized_recursive(CLS,NAME) \ + CLS __libc_lock_recursive_t NAME = {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}; /* Initialize the named lock variable, leaving it in a consistent, unlocked state. */ @@ -86,7 +90,7 @@ typedef pthread_key_t __libc_key_t; pthread_mutexattr_t __attr; \ __pthread_mutexattr_init (&__attr); \ __pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \ - __pthread_mutex_init (&(NAME), &__attr); \ + __pthread_mutex_init (&(NAME).mutex, &__attr); \ __pthread_mutexattr_destroy (&__attr); \ } \ } while (0); @@ -100,7 +104,7 @@ typedef pthread_key_t __libc_key_t; (__pthread_rwlock_destroy != NULL ? __pthread_rwlock_destroy (&(NAME)) : 0); /* Finalize recursive named lock. */ -#define __libc_lock_fini_recursive(NAME) __libc_lock_fini (NAME) +#define __libc_lock_fini_recursive(NAME) __libc_lock_fini ((NAME).mutex) /* Lock the named lock variable. */ #define __libc_lock_lock(NAME) \ @@ -111,7 +115,7 @@ typedef pthread_key_t __libc_key_t; (__pthread_rwlock_wrlock != NULL ? __pthread_rwlock_wrlock (&(NAME)) : 0); /* Lock the recursive named lock variable. */ -#define __libc_lock_lock_recursive(NAME) __libc_lock_lock (NAME) +#define __libc_lock_lock_recursive(NAME) __libc_lock_lock ((NAME).mutex) /* Try to lock the named lock variable. */ #define __libc_lock_trylock(NAME) \ @@ -124,7 +128,7 @@ typedef pthread_key_t __libc_key_t; ? __pthread_rwlock_trywrlock (&(NAME)) : 0) /* Try to lock the recursive named lock variable. */ -#define __libc_lock_trylock_recursive(NAME) __libc_lock_trylock (NAME) +#define __libc_lock_trylock_recursive(NAME) __libc_lock_trylock ((NAME).mutex) /* Unlock the named lock variable. */ #define __libc_lock_unlock(NAME) \ @@ -133,7 +137,7 @@ typedef pthread_key_t __libc_key_t; (__pthread_rwlock_unlock != NULL ? __pthread_rwlock_unlock (&(NAME)) : 0); /* Unlock the recursive named lock variable. */ -#define __libc_lock_unlock_recursive(NAME) __libc_lock_unlock (NAME) +#define __libc_lock_unlock_recursive(NAME) __libc_lock_unlock ((NAME).mutex) /* Define once control variable. */ diff --git a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h index a1893c8..4dc7dcf 100644 --- a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h +++ b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h @@ -17,12 +17,17 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <pthread.h> +#include <bits/libc-lock.h> -typedef pthread_mutex_t _IO_lock_t; +__libc_lock_define_recursive (typedef, _IO_lock_t) /* We need recursive (counting) mutexes. */ -#define _IO_lock_initializer PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +#define _IO_lock_initializer {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP} + +#define _IO_lock_init(_name) __libc_lock_init_recursive (_name) +#define _IO_lock_fini(_name) __libc_lock_fini_recursive (_name) +#define _IO_lock_lock(_name) __libc_lock_lock_recursive (_name) +#define _IO_lock_unlock(_name) __libc_lock_unlock_recursive (_name) #define _IO_cleanup_region_start(_fct, _fp) \ @@ -40,11 +45,3 @@ typedef pthread_mutex_t _IO_lock_t; } #define _IO_cleanup_region_end(_doit) \ __libc_cleanup_region_end (_doit) -#define _IO_lock_init(_name) \ - __libc_lock_init_recursive (_name) -#define _IO_lock_fini(_name) \ - __libc_lock_fini_recursive (_name) -#define _IO_lock_lock(_name) \ - __libc_lock_lock (_name) -#define _IO_lock_unlock(_name) \ - __libc_lock_unlock (_name) diff --git a/sysdeps/generic/bits/libc-lock.h b/sysdeps/generic/bits/libc-lock.h index ec95e81..ca90d35 100644 --- a/sysdeps/generic/bits/libc-lock.h +++ b/sysdeps/generic/bits/libc-lock.h @@ -1,5 +1,5 @@ /* libc-internal interface for mutex locks. Stub version. - Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996,97,99,2000,01 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 @@ -29,6 +29,7 @@ begins with a `*'), because its storage size will not be known outside of libc. */ #define __libc_lock_define(CLASS,NAME) +#define __libc_lock_define_recursive(CLASS,NAME) #define __libc_rwlock_define(CLASS,NAME) /* Define an initialized lock variable NAME with storage class CLASS. */ diff --git a/sysdeps/generic/bits/stdio-lock.h b/sysdeps/generic/bits/stdio-lock.h index 225ccd8..f7c6108 100644 --- a/sysdeps/generic/bits/stdio-lock.h +++ b/sysdeps/generic/bits/stdio-lock.h @@ -22,12 +22,17 @@ #include <bits/libc-lock.h> -__libc_lock_define (typedef, _IO_lock_t) +__libc_lock_define_recursive (typedef, _IO_lock_t) /* We need recursive (counting) mutexes. */ #define _IO_lock_initializer ... #error libio needs recursive mutexes for _IO_MTSAFE_IO +#define _IO_lock_init(_name) __libc_lock_init_recursive (_name) +#define _IO_lock_fini(_name) __libc_lock_fini_recursive (_name) +#define _IO_lock_lock(_name) __libc_lock_lock_recursive (_name) +#define _IO_lock_unlock(_name) __libc_lock_unlock_recursive (_name) + #define _IO_cleanup_region_start(_fct, _fp) \ __libc_cleanup_region_start (_fct, _fp) @@ -35,14 +40,6 @@ __libc_lock_define (typedef, _IO_lock_t) __libc_cleanup_region_start (_fct, NULL) #define _IO_cleanup_region_end(_doit) \ __libc_cleanup_region_end (_doit) -#define _IO_lock_init(_name) \ - __libc_lock_init_recursive (_name) -#define _IO_lock_fini(_name) \ - __libc_lock_fini_recursive (_name) -#define _IO_lock_lock(_name) \ - __libc_lock_lock (_name) -#define _IO_lock_unlock(_name) \ - __libc_lock_unlock (_name) #endif /* bits/stdio-lock.h */ diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index a98b01a..6d196c7 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -31,6 +31,7 @@ #include <dlfcn.h> #include <link.h> #include <dl-lookupcfg.h> +#include <bits/libc-lock.h> __BEGIN_DECLS @@ -229,6 +230,16 @@ extern struct r_search_path_elem *_dl_init_all_dirs; extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */ +/* 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_recursive (extern, _dl_load_lock) + + /* Write message on the debug file descriptor. The parameters are interpreted as for a `printf' call. All the lines start with a tag showing the PID. */ |