diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-03-19 21:09:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-03-19 21:09:31 +0000 |
| commit | 43e2ba6ef645e34aeb5b485e466af69599d02428 (patch) | |
| tree | 8a7a57064f6b39e9dae2381577aabfe47a9fe9c9 /sysdeps/unix/sysv | |
| parent | 6227894ac9e3f0ff699bfcf92393bc38370d9a1e (diff) | |
| download | glibc-43e2ba6ef645e34aeb5b485e466af69599d02428.tar glibc-43e2ba6ef645e34aeb5b485e466af69599d02428.tar.gz glibc-43e2ba6ef645e34aeb5b485e466af69599d02428.tar.bz2 glibc-43e2ba6ef645e34aeb5b485e466af69599d02428.zip | |
Don't use MAX_IOVEC. Test for UIO_FASTIOV and set to 8 if not available.
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/readv.c | 15 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/writev.c | 15 |
2 files changed, 12 insertions, 18 deletions
diff --git a/sysdeps/unix/sysv/linux/readv.c b/sysdeps/unix/sysv/linux/readv.c index 458e8ffb38..c8ff55ab45 100644 --- a/sysdeps/unix/sysv/linux/readv.c +++ b/sysdeps/unix/sysv/linux/readv.c @@ -26,15 +26,12 @@ extern ssize_t __syscall_readv __P ((int, __const struct iovec *, int)); /* Not all versions of the kernel support the large number of records. */ -#undef MAX_IOVEC -#ifdef UIO_FASTIOV -# define MAX_IOVEC UIO_FASTIOV -#else -# define MAX_IOVEC 8 /* 8 is a safe number. */ +#ifndef UIO_FASTIOV +# define UIO_FASTIOV 8 /* 8 is a safe number. */ #endif -/* We should deal with kernel which have a smaller UIO_MAXIOV as well +/* We should deal with kernel which have a smaller UIO_FASTIOV as well as a very big count. */ ssize_t readv (fd, vector, count) @@ -47,7 +44,7 @@ readv (fd, vector, count) bytes_read = __syscall_readv (fd, vector, count); - if (bytes_read < 0 && errno == EINVAL && count > MAX_IOVEC) + if (bytes_read < 0 && errno == EINVAL && count > UIO_FASTIOV) { int i; @@ -55,10 +52,10 @@ readv (fd, vector, count) __set_errno (errno_saved); bytes_read = 0; - for (i = 0; i < count; i += MAX_IOVEC) + for (i = 0; i < count; i += UIO_FASTIOV) { ssize_t bytes = __syscall_readv (fd, vector + i, - MIN (count - i, MAX_IOVEC)); + MIN (count - i, UIO_FASTIOV)); if (bytes < 0) return bytes; diff --git a/sysdeps/unix/sysv/linux/writev.c b/sysdeps/unix/sysv/linux/writev.c index 11afd81d2e..d147186b51 100644 --- a/sysdeps/unix/sysv/linux/writev.c +++ b/sysdeps/unix/sysv/linux/writev.c @@ -25,15 +25,12 @@ extern ssize_t __syscall_writev __P ((int, const struct iovec *, int)); /* Not all versions of the kernel support the large number of records. */ -#undef MAX_IOVEC -#ifdef UIO_FASTIOV -# define MAX_IOVEC UIO_FASTIOV -#else -# define MAX_IOVEC 8 /* 8 is a safe number. */ +#ifndef UIO_FASTIOV +# define UIO_FASTIOV 8 /* 8 is a safe number. */ #endif -/* We should deal with kernel which have a smaller UIO_MAXIOV as well +/* We should deal with kernel which have a smaller UIO_FASTIOV as well as a very big count. */ ssize_t writev (fd, vector, count) @@ -46,7 +43,7 @@ writev (fd, vector, count) bytes_written = __syscall_writev (fd, vector, count); - if (bytes_written < 0 && errno == EINVAL && count > MAX_IOVEC) + if (bytes_written < 0 && errno == EINVAL && count > UIO_FASTIOV) { int i; @@ -54,10 +51,10 @@ writev (fd, vector, count) __set_errno (errno_saved); bytes_written = 0; - for (i = 0; i < count; i += MAX_IOVEC) + for (i = 0; i < count; i += UIO_FASTIOV) { ssize_t bytes = __syscall_writev (fd, vector + i, - MIN (count - i, MAX_IOVEC)); + MIN (count - i, UIO_FASTIOV)); if (bytes < 0) return bytes_written > 0 ? bytes_written : bytes; |