diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread-functions.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/closedir.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/opendir.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/readdir.c | 7 |
5 files changed, 23 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index be2556b4f2..5ef26ee8a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-02-18 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/closedir.c: Outside libc don't use locking. + * sysdeps/unix/opendir.c: Likewise. + * sysdeps/unix/readdir.c: Likewise. + [BZ #2211] * stdio-common/vfscanf.c: Handle localized digits etc for floating point numbers. diff --git a/nptl/sysdeps/pthread/pthread-functions.h b/nptl/sysdeps/pthread/pthread-functions.h index f8c1e92371..ff1e6e9c49 100644 --- a/nptl/sysdeps/pthread/pthread-functions.h +++ b/nptl/sysdeps/pthread/pthread-functions.h @@ -97,16 +97,22 @@ struct pthread_functions void (*ptr__nptl_deallocate_tsd) (void); int (*ptr__nptl_setxid) (struct xid_command *); void (*ptr_freeres) (void); + void (*ptr_wait_lookup_done) (int); }; /* Variable in libc.so. */ extern struct pthread_functions __libc_pthread_functions attribute_hidden; extern int __libc_pthread_functions_init attribute_hidden; -#define PTHFCT_CALL(fct, params) \ +#ifdef PTR_DEMANGLE +# define PTHFCT_CALL(fct, params) \ + __libc_pthread_functions.fct params +#else +# define PTHFCT_CALL(fct, params) \ ({ __typeof (__libc_pthread_functions.fct) __p; \ __p = __libc_pthread_functions.fct; \ PTR_DEMANGLE (__p); \ __p params; }) +#endif #endif /* pthread-functions.h */ diff --git a/sysdeps/unix/closedir.c b/sysdeps/unix/closedir.c index 09deee7e85..3d65e14f61 100644 --- a/sysdeps/unix/closedir.c +++ b/sysdeps/unix/closedir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1993,1995,1996,1998,2002,2003 +/* Copyright (C) 1991,1993,1995,1996,1998,2002,2003, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -45,7 +45,9 @@ __closedir (DIR *dirp) fd = dirp->fd; +#ifndef NOT_IN_libc __libc_lock_fini (dirp->lock); +#endif free ((void *) dirp); diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c index 6aa738fb69..59772cda75 100644 --- a/sysdeps/unix/opendir.c +++ b/sysdeps/unix/opendir.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-1996,98,2000-2003,2005 Free Software Foundation, Inc. +/* Copyright (C) 1991-1996,98,2000-2003,2005,2007 + 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 @@ -173,7 +174,9 @@ __alloc_dir (int fd, bool close_fd, const struct stat64 *statp) dirp->allocation = allocation; dirp->fd = fd; +#ifndef NOT_IN_libc __libc_lock_init (dirp->lock); +#endif return dirp; } diff --git a/sysdeps/unix/readdir.c b/sysdeps/unix/readdir.c index 4a0f0890e9..13e5e9a021 100644 --- a/sysdeps/unix/readdir.c +++ b/sysdeps/unix/readdir.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,99,2000,02 - Free Software Foundation, Inc. +/* Copyright (C) 1991-1997,1999,2000,2002,2007 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 @@ -42,7 +41,9 @@ __READDIR (DIR *dirp) DIRENT_TYPE *dp; int saved_errno = errno; +#ifndef NOT_IN_libc __libc_lock_lock (dirp->lock); +#endif do { @@ -110,7 +111,9 @@ __READDIR (DIR *dirp) /* Skip deleted files. */ } while (dp->d_ino == 0); +#ifndef NOT_IN_libc __libc_lock_unlock (dirp->lock); +#endif return dp; } |