diff options
Diffstat (limited to 'libc/sysdeps/linux/common/readv.c')
| -rw-r--r-- | libc/sysdeps/linux/common/readv.c | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/libc/sysdeps/linux/common/readv.c b/libc/sysdeps/linux/common/readv.c index fce396d5f..9418ea430 100644 --- a/libc/sysdeps/linux/common/readv.c +++ b/libc/sysdeps/linux/common/readv.c @@ -10,41 +10,21 @@ #include <sys/syscall.h> #include <sys/uio.h> - -#ifdef __UCLIBC_HAS_THREADS_NATIVE__ -#include <sysdep-cancel.h> +#include <cancel.h> /* We should deal with kernel which have a smaller UIO_FASTIOV as well as a very big count. */ -static ssize_t __readv (int fd, const struct iovec *vector, int count) +static ssize_t __NC(readv)(int fd, const struct iovec *vector, int count) { - ssize_t bytes_read; - - bytes_read = INLINE_SYSCALL (readv, 3, fd, vector, count); - - if (bytes_read >= 0 || errno != EINVAL || count <= UIO_FASTIOV) - return bytes_read; - - /* glibc tries again, but we do not. */ - //return __atomic_readv_replacement (fd, vector, count); - - return -1; -} - -ssize_t readv (int fd, const struct iovec *vector, int count) -{ - if (SINGLE_THREAD_P) - return __readv (fd, vector, count); - - int oldtype = LIBC_CANCEL_ASYNC (); + ssize_t bytes_read = INLINE_SYSCALL(readv, 3, fd, vector, count); - int result = __readv (fd, vector, count); + if (bytes_read >= 0 || errno != EINVAL || count <= UIO_FASTIOV) + return bytes_read; - LIBC_CANCEL_RESET (oldtype); + /* glibc tries again, but we do not. */ + /* return __atomic_readv_replacement (fd, vector, count); */ - return result; + return -1; } -#else -_syscall3(ssize_t, readv, int, filedes, const struct iovec *, vector, - int, count) -#endif +CANCELLABLE_SYSCALL(ssize_t, readv, (int fd, const struct iovec *vector, int count), + (fd, vector, count)) |