diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-04-03 17:23:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-04-03 17:23:13 +0000 |
| commit | 2dbe6afe7c13af9790f2d37d3be3c8fa3262bd27 (patch) | |
| tree | 6080f12475eef12e39f1df2cfd6be163fa5c82db /sysdeps/unix/sysv/linux/readv.c | |
| parent | a065c0076a1b76b9eb375ae051176e9bf518816a (diff) | |
| download | glibc-2dbe6afe7c13af9790f2d37d3be3c8fa3262bd27.tar.gz glibc-2dbe6afe7c13af9790f2d37d3be3c8fa3262bd27.tar.xz glibc-2dbe6afe7c13af9790f2d37d3be3c8fa3262bd27.zip | |
* sysdeps/unix/sysv/linux/kernel-features.h: Define
__ASSUME_COMPLETE_READV_WRITEV. * sysdeps/unix/sysv/linux/readv.c: No need for userlevel fallback with modern kernels. * sysdeps/unix/sysv/linux/writev.c: Likewise. * sysdeps/posix/readv.c: Since read is a cancellation point we have to free a possible malloced buffer in case of cancellation. * sysdeps/posix/writev.c: Likewise for write. c2009-04-01 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/readv.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/readv.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/readv.c b/sysdeps/unix/sysv/linux/readv.c index 250c00a075..d12fa49373 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; @@ -45,10 +46,14 @@ do_readv (int fd, const struct iovec *vector, int count) bytes_read = INLINE_SYSCALL (readv, 3, fd, CHECK_N (vector, count), count); +#ifdef __ASSUME_COMPLETE_READV_WRITEV + return bytes_read; +#else if (bytes_read >= 0 || errno != EINVAL || count <= UIO_FASTIOV) return bytes_read; return __atomic_readv_replacement (fd, vector, count); +#endif } @@ -72,5 +77,7 @@ __libc_readv (fd, vector, count) 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 |