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

Split _dl_writev out from _dl_debug_vdprintf.

This commit is contained in:
Roland McGrath 2013-05-06 11:30:41 -07:00
parent b7dab1e4d7
commit d5e8275481
4 changed files with 104 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2013-05-06 Roland McGrath <roland@hack.frob.com>
* elf/dl-writev.h: New file.
* elf/dl-misc.c: Include it.
(_dl_debug_vdprintf): Call _dl_writev instead of __writev et al.
* sysdeps/unix/sysv/linux/dl-writev.h: New file.
2013-05-04 Joseph Myers <joseph@codesourcery.com> 2013-05-04 Joseph Myers <joseph@codesourcery.com>
* math/libm-test.inc (noXFails): Remove variable. * math/libm-test.inc (noXFails): Remove variable.

23
elf/dl-misc.c
View File

@ -31,7 +31,8 @@
#include <sys/uio.h> #include <sys/uio.h>
#include <sysdep.h> #include <sysdep.h>
#include <_itoa.h> #include <_itoa.h>
#include <bits/libc-lock.h> #include <dl-writev.h>
/* Read the whole contents of FILE into new mmap'd space with given /* Read the whole contents of FILE into new mmap'd space with given
protections. *SIZEP gets the size of the file. On error MAP_FAILED protections. *SIZEP gets the size of the file. On error MAP_FAILED
@ -239,25 +240,7 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg)
} }
/* Finally write the result. */ /* Finally write the result. */
#ifdef HAVE_INLINED_SYSCALLS _dl_writev (fd, iov, niov);
INTERNAL_SYSCALL_DECL (err);
INTERNAL_SYSCALL (writev, err, 3, fd, &iov, niov);
#elif RTLD_PRIVATE_ERRNO
/* We have to take this lock just to be sure we don't clobber the private
errno when it's being used by another thread that cares about it.
Yet we must be sure not to try calling the lock functions before
the thread library is fully initialized. */
if (__builtin_expect (INTUSE (_dl_starting_up), 0))
__writev (fd, iov, niov);
else
{
__rtld_lock_lock_recursive (GL(dl_load_lock));
__writev (fd, iov, niov);
__rtld_lock_unlock_recursive (GL(dl_load_lock));
}
#else
__writev (fd, iov, niov);
#endif
} }

56
elf/dl-writev.h Normal file
View File

@ -0,0 +1,56 @@
/* Message-writing for the dynamic linker. Generic version.
Copyright (C) 2013 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
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sys/uio.h>
#include <ldsodefs.h>
#include <bits/libc-lock.h>
/* This is used from only one place: dl-misc.c:_dl_debug_vdprintf.
Hence it's in a header with the expectation it will be inlined.
This is writev, but with a constraint added and others loosened:
1. Under RTLD_PRIVATE_ERRNO, it must not clobber the private errno
when another thread holds the dl_load_lock.
2. It is not obliged to detect and report errors at all.
3. It's not really obliged to deliver a single atomic write
(though it may be preferable). */
static inline void
_dl_writev (int fd, const struct iovec *iov, size_t niov)
{
/* Note that if __writev is an implementation that calls malloc,
this will cause linking problems building the dynamic linker. */
#if RTLD_PRIVATE_ERRNO
/* We have to take this lock just to be sure we don't clobber the private
errno when it's being used by another thread that cares about it.
Yet we must be sure not to try calling the lock functions before
the thread library is fully initialized. */
if (__builtin_expect (INTUSE (_dl_starting_up), 0))
__writev (fd, iov, niov);
else
{
__rtld_lock_lock_recursive (GL(dl_load_lock));
__writev (fd, iov, niov);
__rtld_lock_unlock_recursive (GL(dl_load_lock));
}
#else
__writev (fd, iov, niov);
#endif
}

38
sysdeps/unix/sysv/linux/dl-writev.h Normal file
View File

@ -0,0 +1,38 @@
/* Message-writing for the dynamic linker. Linux version.
Copyright (C) 2013 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
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sys/uio.h>
#include <sysdep.h>
/* This is used from only one place: dl-misc.c:_dl_debug_vdprintf.
Hence it's in a header with the expectation it will be inlined.
This is writev, but with a constraint added and others loosened:
1. Under RTLD_PRIVATE_ERRNO, it must not clobber the private errno
when another thread holds the dl_load_lock.
2. It is not obliged to detect and report errors at all.
3. It's not really obliged to deliver a single atomic write
(though it may be preferable). */
static inline void
_dl_writev (int fd, const struct iovec *iov, size_t niov)
{
INTERNAL_SYSCALL_DECL (err);
INTERNAL_SYSCALL (writev, err, 3, fd, iov, niov);
}