From 9df9c60aa93287211cf9698eb979d80fded765dc Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Thu, 21 Apr 2011 21:45:46 +0200 Subject: add cancellation for read, write, close close.c: add function __close_nocancel_no_status to be used internally in libc avoiding inlining it everywhere. Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- include/unistd.h | 10 ++++++++++ libc/sysdeps/linux/common/close.c | 15 ++++++++------- libc/sysdeps/linux/common/read.c | 14 +++++++------- libc/sysdeps/linux/common/write.c | 18 ++++++------------ 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/include/unistd.h b/include/unistd.h index a886ad1a8..2d53aa4b9 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -354,7 +354,11 @@ libc_hidden_proto(lseek64) This function is a cancellation point and therefore not marked with __THROW. */ extern int close (int __fd); +#ifdef _LIBC +extern __typeof(close) __close_nocancel attribute_hidden; +extern void __close_nocancel_no_status(int) attribute_hidden; libc_hidden_proto(close) +#endif /* Read NBYTES into BUF from FD. Return the number read, -1 for errors or 0 for EOF. @@ -362,14 +366,20 @@ libc_hidden_proto(close) This function is a cancellation point and therefore not marked with __THROW. */ extern ssize_t read (int __fd, void *__buf, size_t __nbytes) __wur; +#ifdef _LIBC +extern __typeof(read) __read_nocancel attribute_hidden; libc_hidden_proto(read) +#endif /* Write N bytes of BUF to FD. Return the number written, or -1. This function is a cancellation point and therefore not marked with __THROW. */ extern ssize_t write (int __fd, __const void *__buf, size_t __n) __wur; +#ifdef _LIBC +extern __typeof(write) __write_nocancel attribute_hidden; libc_hidden_proto(write) +#endif #ifdef __USE_UNIX98 # ifndef __USE_FILE_OFFSET64 diff --git a/libc/sysdeps/linux/common/close.c b/libc/sysdeps/linux/common/close.c index d6b5fbb20..c26525cf4 100644 --- a/libc/sysdeps/linux/common/close.c +++ b/libc/sysdeps/linux/common/close.c @@ -9,12 +9,13 @@ #include #include +#include -_syscall1(int, close, int, fd) +#define __NR___close_nocancel __NR_close +_syscall1(int, __NC(close), int, fd) -#ifndef __LINUXTHREADS_OLD__ -libc_hidden_def(close) -#else -libc_hidden_weak(close) -strong_alias(close,__libc_close) -#endif +#define __NR___close_nocancel_no_status __NR_close +_syscall_noerr1(void, __close_nocancel_no_status, int, fd) + +CANCELLABLE_SYSCALL(int, close, (int fd), (fd)) +lt_libc_hidden(close) diff --git a/libc/sysdeps/linux/common/read.c b/libc/sysdeps/linux/common/read.c index 9e122fc10..67c29b5c1 100644 --- a/libc/sysdeps/linux/common/read.c +++ b/libc/sysdeps/linux/common/read.c @@ -9,11 +9,11 @@ #include #include +#include -_syscall3(ssize_t, read, int, fd, __ptr_t, buf, size_t, count) -#ifndef __LINUXTHREADS_OLD__ -libc_hidden_def(read) -#else -libc_hidden_weak(read) -strong_alias(read,__libc_read) -#endif +#define __NR___read_nocancel __NR_read +_syscall3(ssize_t, __NC(read), int, fd, void *, buf, size_t, count) + +CANCELLABLE_SYSCALL(ssize_t, read, (int fd, void *buf, size_t count), + (fd, buf, count)) +lt_libc_hidden(read) diff --git a/libc/sysdeps/linux/common/write.c b/libc/sysdeps/linux/common/write.c index 5a6f7225f..e4d3ab897 100644 --- a/libc/sysdeps/linux/common/write.c +++ b/libc/sysdeps/linux/common/write.c @@ -9,17 +9,11 @@ #include #include +#include -_syscall3(ssize_t, write, int, fd, const __ptr_t, buf, size_t, count) -#ifndef __LINUXTHREADS_OLD__ -libc_hidden_def(write) -#else -libc_hidden_weak(write) -strong_alias(write,__libc_write) -#endif +#define __NR___write_nocancel __NR_write +_syscall3(ssize_t, __NC(write), int, fd, const void *, buf, size_t, count) -#if 0 -/* Stupid libgcc.a from gcc 2.95.x uses __write in pure.o - * which is a blatant GNU libc-ism... */ -strong_alias(write,__write) -#endif +CANCELLABLE_SYSCALL(ssize_t, write, (int fd, const void *buf, size_t count), + (fd, buf, count)) +lt_libc_hidden(write) -- cgit v1.2.3