diff options
author | Jakub Jelinek <jakub@redhat.com> | 2009-04-07 06:20:59 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2009-04-07 06:20:59 +0000 |
commit | 11799e4168a3ef36af3cb7ffb4f5cfaed7e244d7 (patch) | |
tree | dbf8c4b86a0b68b7754f43e579c8f035d47d1ec5 /sysdeps/unix/sysv/linux/readv.c | |
parent | 1a6da537df1fe1726d95407ec04cf65caa1f8121 (diff) |
Updated to fedora-glibc-20090407T0545
Diffstat (limited to 'sysdeps/unix/sysv/linux/readv.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/readv.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/sysdeps/unix/sysv/linux/readv.c b/sysdeps/unix/sysv/linux/readv.c index 250c00a075..bff4a3ff74 100644 --- a/sysdeps/unix/sysv/linux/readv.c +++ b/sysdeps/unix/sysv/linux/readv.c @@ -1,5 +1,5 @@ /* readv supports all Linux kernels >= 2.0. - Copyright (C) 1997,1998,2000,2002,2003 Free Software Foundation, Inc. + Copyright (C) 1997,1998,2000,2002,2003,2009 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 @@ -25,6 +25,7 @@ #include <sysdep-cancel.h> #include <sys/syscall.h> #include <bp-checks.h> +#include <kernel-features.h> static ssize_t __atomic_readv_replacement (int, __const struct iovec *, int) internal_function; @@ -36,41 +37,38 @@ static ssize_t __atomic_readv_replacement (int, __const struct iovec *, #endif -/* We should deal with kernel which have a smaller UIO_FASTIOV as well - as a very big count. */ -static ssize_t -do_readv (int fd, const struct iovec *vector, int count) -{ - ssize_t bytes_read; - - bytes_read = INLINE_SYSCALL (readv, 3, fd, CHECK_N (vector, count), count); - - if (bytes_read >= 0 || errno != EINVAL || count <= UIO_FASTIOV) - return bytes_read; - - return __atomic_readv_replacement (fd, vector, count); -} - - ssize_t __libc_readv (fd, vector, count) int fd; const struct iovec *vector; int count; { - if (SINGLE_THREAD_P) - return do_readv (fd, vector, count); + ssize_t result; - int oldtype = LIBC_CANCEL_ASYNC (); + if (SINGLE_THREAD_P) + result = INLINE_SYSCALL (readv, 3, fd, CHECK_N (vector, count), count); + else + { + int oldtype = LIBC_CANCEL_ASYNC (); - int result = do_readv (fd, vector, count); + result = INLINE_SYSCALL (readv, 3, fd, CHECK_N (vector, count), count); - LIBC_CANCEL_RESET (oldtype); + LIBC_CANCEL_RESET (oldtype); + } +#ifdef __ASSUME_COMPLETE_READV_WRITEV return result; +#else + if (result >= 0 || errno != EINVAL || count <= UIO_FASTIOV) + return result; + + return __atomic_readv_replacement (fd, vector, count); +#endif } strong_alias (__libc_readv, __readv) weak_alias (__libc_readv, readv) -#define __libc_readv static internal_function __atomic_readv_replacement -#include <sysdeps/posix/readv.c> +#ifndef __ASSUME_COMPLETE_READV_WRITEV +# define __libc_readv static internal_function __atomic_readv_replacement +# include <sysdeps/posix/readv.c> +#endif |