From 25b266aacb4ef6ec88ed1989f280538805d6917d Mon Sep 17 00:00:00 2001 From: Peter S. Mazinger Date: Thu, 21 Apr 2011 22:13:29 +0200 Subject: [PATCH 313/396] open.c: add cancellation using cancel.h Signed-off-by: Peter S. Mazinger --- libc/sysdeps/linux/common/open.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c index 9fb694d..a72e84d 100644 --- a/libc/sysdeps/linux/common/open.c +++ b/libc/sysdeps/linux/common/open.c @@ -8,15 +8,17 @@ */ #include -#include -#include #include -#include -#include +#include +#include #define __NR___syscall_open __NR_open -static __inline__ _syscall3(int, __syscall_open, const char *, file, - int, flags, __kernel_mode_t, mode) +static __always_inline _syscall3(int, __syscall_open, const char *, file, + int, flags, __kernel_mode_t, mode) +strong_alias_untyped(__syscall_open,__NC(open)) + +#define __NR___open2_nocancel __NR_open +_syscall2(int, __NC(open2), const char *, file, int, flags) int open(const char *file, int oflag, ...) { @@ -29,11 +31,14 @@ int open(const char *file, int oflag, ...) va_end(arg); } - return __syscall_open(file, oflag, mode); -} -#ifndef __LINUXTHREADS_OLD__ -libc_hidden_def(open) -#else -libc_hidden_weak(open) -strong_alias(open,__libc_open) + if (SINGLE_THREAD_P) + return __NC(open)(file, oflag, mode); +#ifdef __NEW_THREADS + int oldtype = LIBC_CANCEL_ASYNC (); + int result = __NC(open)(file, oflag, mode); + LIBC_CANCEL_RESET (oldtype); + return result; #endif +} +lt_strong_alias(open) +lt_libc_hidden(open) -- 1.7.0.4