qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/unix/closedir.c: Outside libc don't use locking. 

* sysdeps/unix/opendir.c: Likewise.
	* sysdeps/unix/readdir.c: Likewise.
This commit is contained in:
Ulrich Drepper 2007-02-19 05:44:33 +00:00
parent ecb72bd5b6
commit 858ee15dec
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2007-02-18 Ulrich Drepper <drepper@redhat.com> 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] [BZ #2211]
* stdio-common/vfscanf.c: Handle localized digits etc for floating * stdio-common/vfscanf.c: Handle localized digits etc for floating
point numbers. point numbers.

8
nptl/sysdeps/pthread/pthread-functions.h
View File

@ -97,16 +97,22 @@ struct pthread_functions
void (*ptr__nptl_deallocate_tsd) (void); void (*ptr__nptl_deallocate_tsd) (void);
int (*ptr__nptl_setxid) (struct xid_command *); int (*ptr__nptl_setxid) (struct xid_command *);
void (*ptr_freeres) (void); void (*ptr_freeres) (void);
void (*ptr_wait_lookup_done) (int);
}; };
/* Variable in libc.so. */ /* Variable in libc.so. */
extern struct pthread_functions __libc_pthread_functions attribute_hidden; extern struct pthread_functions __libc_pthread_functions attribute_hidden;
extern int __libc_pthread_functions_init 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; \ ({ __typeof (__libc_pthread_functions.fct) __p; \
__p = __libc_pthread_functions.fct; \ __p = __libc_pthread_functions.fct; \
PTR_DEMANGLE (__p); \ PTR_DEMANGLE (__p); \
__p params; }) __p params; })
#endif
#endif /* pthread-functions.h */ #endif /* pthread-functions.h */

4
sysdeps/unix/closedir.c
View File

@ -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. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -45,7 +45,9 @@ __closedir (DIR *dirp)
fd = dirp->fd; fd = dirp->fd;
#ifndef NOT_IN_libc
__libc_lock_fini (dirp->lock); __libc_lock_fini (dirp->lock);
#endif
free ((void *) dirp); free ((void *) dirp);

5
sysdeps/unix/opendir.c
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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->allocation = allocation;
dirp->fd = fd; dirp->fd = fd;
#ifndef NOT_IN_libc
__libc_lock_init (dirp->lock); __libc_lock_init (dirp->lock);
#endif
return dirp; return dirp;
} }

7
sysdeps/unix/readdir.c
View File

@ -1,5 +1,4 @@
/* Copyright (C) 1991,92,93,94,95,96,97,99,2000,02 /* Copyright (C) 1991-1997,1999,2000,2002,2007 Free Software Foundation, Inc.
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -42,7 +41,9 @@ __READDIR (DIR *dirp)
DIRENT_TYPE *dp; DIRENT_TYPE *dp;
int saved_errno = errno; int saved_errno = errno;
#ifndef NOT_IN_libc
__libc_lock_lock (dirp->lock); __libc_lock_lock (dirp->lock);
#endif
do do
{ {
@ -110,7 +111,9 @@ __READDIR (DIR *dirp)
/* Skip deleted files. */ /* Skip deleted files. */
} while (dp->d_ino == 0); } while (dp->d_ino == 0);
#ifndef NOT_IN_libc
__libc_lock_unlock (dirp->lock); __libc_lock_unlock (dirp->lock);
#endif
return dp; return dp;
} }