diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/lockf.c | 5 | ||||
| -rw-r--r-- | sysdeps/generic/pselect.c | 5 | ||||
| -rw-r--r-- | sysdeps/posix/sigpause.c | 3 | ||||
| -rw-r--r-- | sysdeps/posix/system.c | 3 | ||||
| -rw-r--r-- | sysdeps/posix/waitid.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/clock_nanosleep.c | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/clock_nanosleep.c | 22 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.h | 126 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sleep.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/usleep.c | 5 |
10 files changed, 142 insertions, 51 deletions
diff --git a/sysdeps/generic/lockf.c b/sysdeps/generic/lockf.c index 182a70094c..7b23f66bc9 100644 --- a/sysdeps/generic/lockf.c +++ b/sysdeps/generic/lockf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1994,1996,1997,1998,2000,2003 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 @@ -67,5 +67,8 @@ lockf (int fd, int cmd, off_t len) return -1; } + /* lockf() is a cancellation point but so is fcntl() if F_SETLKW is + used. Therefore we don't have to care about cancellation here, + the fcntl() function will take care of it. */ return __fcntl (fd, cmd, &fl); } diff --git a/sysdeps/generic/pselect.c b/sysdeps/generic/pselect.c index e090d6e526..43b371cce7 100644 --- a/sysdeps/generic/pselect.c +++ b/sysdeps/generic/pselect.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,2001,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -50,6 +50,9 @@ do_pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, if (sigmask != NULL) __sigprocmask (SIG_SETMASK, sigmask, &savemask); + /* Note the pselect() is a cancellation point. But since we call + select() which itself is a cancellation point we do not have + to do anything here. */ retval = __select (nfds, readfds, writefds, exceptfds, timeout != NULL ? &tval : NULL); diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c index 78b247ebd9..98b69d3c98 100644 --- a/sysdeps/posix/sigpause.c +++ b/sysdeps/posix/sigpause.c @@ -40,6 +40,9 @@ do_sigpause (int sig_or_mask, int is_sig) else if (sigset_set_old_mask (&set, sig_or_mask) < 0) return -1; + /* Note the sigpause() is a cancellation point. But since we call + sigsuspend() which itself is a cancellation point we do not have + to do anything here. */ return __sigsuspend (&set); } diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index b1c826e4bc..8548313314 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -162,6 +162,9 @@ do_system (const char *line) } while (child != pid); #else + /* Note the system() is a cancellation point. But since we call + waitpid() which itself is a cancellation point we do not + have to do anything here. */ if (TEMP_FAILURE_RETRY (__waitpid (pid, &status, 0)) != pid) status = -1; #endif diff --git a/sysdeps/posix/waitid.c b/sysdeps/posix/waitid.c index 679d97d203..e388d173f4 100644 --- a/sysdeps/posix/waitid.c +++ b/sysdeps/posix/waitid.c @@ -1,5 +1,5 @@ /* Pseudo implementation of waitid. - Copyright (C) 1997, 1998, 2002 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1997. @@ -66,6 +66,9 @@ do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options) return -1; } + /* Note the waitid() is a cancellation point. But since we call + waitpid() which itself is a cancellation point we do not have + to do anything here. */ child = __waitpid (pid, &status, options); if (child == -1) diff --git a/sysdeps/unix/clock_nanosleep.c b/sysdeps/unix/clock_nanosleep.c index ec468ad8c9..34bbc2dae6 100644 --- a/sysdeps/unix/clock_nanosleep.c +++ b/sysdeps/unix/clock_nanosleep.c @@ -21,7 +21,7 @@ #include <errno.h> #include <time.h> #include <hp-timing.h> - +#include <sysdep-cancel.h> #if HP_TIMING_AVAIL # define CPUCLOCK_P(clock) \ @@ -94,5 +94,15 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, /* Not supported. */ return ENOTSUP; - return __builtin_expect (nanosleep (req, rem), 0) ? errno : 0; + if (SINGLE_THREAD_P) + return __builtin_expect (nanosleep (req, rem), 0) ? errno : 0; + + /* More than one thread running, enable cancellation. */ + int oldstate = LIBC_CANCEL_ASYNC (); + + int result = __builtin_expect (nanosleep (req, rem), 0) ? errno : 0; + + LIBC_CANCEL_RESET (oldstate); + + return result; } diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index ceb3801eb9..2a3dd411a1 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -18,7 +18,7 @@ #include <time.h> -#include <sysdep.h> +#include <sysdep-cancel.h> #include "kernel-features.h" @@ -32,7 +32,18 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, INTERNAL_SYSCALL_DECL (err); int r; - r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, rem); + if (SINGLE_THREAD_P) + r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, rem); + else + { + int oldstate = LIBC_CANCEL_ASYNC (); + + r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, + rem); + + LIBC_CANCEL_RESET (oldstate); + } + return (INTERNAL_SYSCALL_ERROR_P (r, err) ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); } @@ -48,15 +59,20 @@ extern int __libc_missing_posix_timers attribute_hidden; if (!__libc_missing_posix_timers) \ { \ INTERNAL_SYSCALL_DECL (err); \ + \ + int oldstate = LIBC_CANCEL_ASYNC (); \ + \ int r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, \ req, rem); \ \ + LIBC_CANCEL_RESET (oldstate); \ + \ if (!INTERNAL_SYSCALL_ERROR_P (r, err)) \ return 0; \ \ if (INTERNAL_SYSCALL_ERRNO (r, err) != ENOSYS) \ return INTERNAL_SYSCALL_ERRNO (r, err); \ - \ + \ __libc_missing_posix_timers = 1; \ } # endif diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index f8f4a55a75..95124797e9 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -297,7 +297,7 @@ asm (".L__X'%ebx = 1\n\t" ".macro bpushl name reg\n\t" ".if 1 - \\name\n\t" ".if 2 - \\name\n\t" - "pushl %ebx\n\t" + "error\n\t" ".else\n\t" "xchgl \\reg, %ebx\n\t" ".endif\n\t" @@ -306,18 +306,11 @@ asm (".L__X'%ebx = 1\n\t" ".macro bpopl name reg\n\t" ".if 1 - \\name\n\t" ".if 2 - \\name\n\t" - "popl %ebx\n\t" + "error\n\t" ".else\n\t" "xchgl \\reg, %ebx\n\t" ".endif\n\t" ".endif\n\t" - ".endm\n\t" - ".macro bmovl name reg\n\t" - ".if 1 - \\name\n\t" - ".if 2 - \\name\n\t" - "movl \\reg, %ebx\n\t" - ".endif\n\t" - ".endif\n\t" ".endm\n\t"); /* Define a macro which expands inline into the wrapper code for a system @@ -342,7 +335,8 @@ asm (".L__X'%ebx = 1\n\t" # ifdef SHARED # define INTERNAL_SYSCALL(name, err, nr, args...) \ ({ \ - unsigned int resultvar; \ + register unsigned int resultvar; \ + EXTRAVAR_##nr \ asm volatile ( \ LOADARGS_##nr \ "movl %1, %%eax\n\t" \ @@ -355,7 +349,8 @@ asm (".L__X'%ebx = 1\n\t" # else # define INTERNAL_SYSCALL(name, err, nr, args...) \ ({ \ - unsigned int resultvar; \ + register unsigned int resultvar; \ + EXTRAVAR_##nr \ asm volatile ( \ LOADARGS_##nr \ "movl %1, %%eax\n\t" \ @@ -368,11 +363,12 @@ asm (".L__X'%ebx = 1\n\t" #else # define INTERNAL_SYSCALL(name, err, nr, args...) \ ({ \ - unsigned int resultvar; \ + register unsigned int resultvar; \ + EXTRAVAR_##nr \ asm volatile ( \ LOADARGS_##nr \ "movl %1, %%eax\n\t" \ - "int $0x80\n\t" \ + "int $0x80\n\t" \ RESTOREARGS_##nr \ : "=a" (resultvar) \ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ @@ -390,44 +386,92 @@ asm (".L__X'%ebx = 1\n\t" #define INTERNAL_SYSCALL_ERRNO(val, err) (-(val)) #define LOADARGS_0 -#if defined I386_USE_SYSENTER && defined SHARED -# define LOADARGS_1 \ - "bpushl .L__X'%k3, %k3\n\t" \ - "bmovl .L__X'%k3, %k3\n\t" +#ifdef __PIC__ +# if defined I386_USE_SYSENTER +# define LOADARGS_1 \ + "bpushl .L__X'%k3, %k3\n\t" +# define LOADARGS_5 \ + "movl %%ebx, %4\n\t" \ + "movl %3, %%ebx\n\t" +# else +# define LOADARGS_1 \ + "bpushl .L__X'%k2, %k2\n\t" +# define LOADARGS_5 \ + "movl %%ebx, %3\n\t" \ + "movl %2, %%ebx\n\t" +# endif +# define LOADARGS_2 LOADARGS_1 +# define LOADARGS_3 \ + "xchgl %%ebx, %%edi\n\t" +# define LOADARGS_4 LOADARGS_3 #else -# define LOADARGS_1 \ - "bpushl .L__X'%k2, %k2\n\t" \ - "bmovl .L__X'%k2, %k2\n\t" +# define LOADARGS_1 +# define LOADARGS_2 +# define LOADARGS_3 +# define LOADARGS_4 +# define LOADARGS_5 #endif -#define LOADARGS_2 LOADARGS_1 -#define LOADARGS_3 LOADARGS_1 -#define LOADARGS_4 LOADARGS_1 -#define LOADARGS_5 LOADARGS_1 #define RESTOREARGS_0 -#if defined I386_USE_SYSENTER && defined SHARED -# define RESTOREARGS_1 \ +#ifdef __PIC__ +# if defined I386_USE_SYSENTER && defined SHARED +# define RESTOREARGS_1 \ "bpopl .L__X'%k3, %k3\n\t" -#else -# define RESTOREARGS_1 \ +# define RESTOREARGS_5 \ + "movl %4, %%ebx" +# else +# define RESTOREARGS_1 \ "bpopl .L__X'%k2, %k2\n\t" +# define RESTOREARGS_5 \ + "movl %3, %%ebx" +# endif +# define RESTOREARGS_2 RESTOREARGS_1 +# define RESTOREARGS_3 \ + "xchgl %%edi, %%ebx\n\t" +# define RESTOREARGS_4 RESTOREARGS_3 +#else +# define RESTOREARGS_1 +# define RESTOREARGS_2 +# define RESTOREARGS_3 +# define RESTOREARGS_4 +# define RESTOREARGS_5 #endif -#define RESTOREARGS_2 RESTOREARGS_1 -#define RESTOREARGS_3 RESTOREARGS_1 -#define RESTOREARGS_4 RESTOREARGS_1 -#define RESTOREARGS_5 RESTOREARGS_1 #define ASMFMT_0() -#define ASMFMT_1(arg1) \ - , "acdSD" (arg1) -#define ASMFMT_2(arg1, arg2) \ +#ifdef __PIC__ +# define ASMFMT_1(arg1) \ + , "cd" (arg1) +# define ASMFMT_2(arg1, arg2) \ , "d" (arg1), "c" (arg2) -#define ASMFMT_3(arg1, arg2, arg3) \ - , "aSD" (arg1), "c" (arg2), "d" (arg3) -#define ASMFMT_4(arg1, arg2, arg3, arg4) \ - , "aD" (arg1), "c" (arg2), "d" (arg3), "S" (arg4) -#define ASMFMT_5(arg1, arg2, arg3, arg4, arg5) \ - , "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5) +# define ASMFMT_3(arg1, arg2, arg3) \ + , "D" (arg1), "c" (arg2), "d" (arg3) +# define ASMFMT_4(arg1, arg2, arg3, arg4) \ + , "D" (arg1), "c" (arg2), "d" (arg3), "S" (arg4) +# define ASMFMT_5(arg1, arg2, arg3, arg4, arg5) \ + , "0" (arg1), "m" (_xv), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5) +#else +# define ASMFMT_1(arg1) \ + , "b" (arg1) +# define ASMFMT_2(arg1, arg2) \ + , "b" (arg1), "c" (arg2) +# define ASMFMT_3(arg1, arg2, arg3) \ + , "b" (arg1), "c" (arg2), "d" (arg3) +# define ASMFMT_4(arg1, arg2, arg3, arg4) \ + , "b" (arg1), "c" (arg2), "d" (arg3), "S" (arg4) +# define ASMFMT_5(arg1, arg2, arg3, arg4, arg5) \ + , "b" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5) +#endif + +#define EXTRAVAR_0 +#define EXTRAVAR_1 +#define EXTRAVAR_2 +#define EXTRAVAR_3 +#define EXTRAVAR_4 +#ifdef __PIC__ +# define EXTRAVAR_5 int _xv; +#else +# define EXTRAVAR_5 +#endif #endif /* __ASSEMBLER__ */ diff --git a/sysdeps/unix/sysv/linux/sleep.c b/sysdeps/unix/sysv/linux/sleep.c index 0cf6be285d..ae24afe1ae 100644 --- a/sysdeps/unix/sysv/linux/sleep.c +++ b/sysdeps/unix/sysv/linux/sleep.c @@ -1,5 +1,5 @@ /* Implementation of the POSIX sleep function using nanosleep. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -64,6 +64,9 @@ __sleep (unsigned int seconds) return -1; } + /* Note the sleep() is a cancellation point. But since we call + nanosleep() which itself is a cancellation point we do not + have to do anything here. */ if (oact.sa_handler == SIG_IGN) { /* We should leave SIGCHLD blocked. */ diff --git a/sysdeps/unix/sysv/linux/usleep.c b/sysdeps/unix/sysv/linux/usleep.c index 643429eade..f770c57884 100644 --- a/sysdeps/unix/sysv/linux/usleep.c +++ b/sysdeps/unix/sysv/linux/usleep.c @@ -1,5 +1,5 @@ /* Implementation of the BSD usleep function using nanosleep. - Copyright (C) 1996, 1997, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2001, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -27,5 +27,8 @@ usleep (useconds_t useconds) struct timespec ts = { .tv_sec = (long int) (useconds / 1000000), .tv_nsec = (long int) (useconds % 1000000) * 1000ul }; + /* Note the usleep() is a cancellation point. But since we call + nanosleep() which itself is a cancellation point we do not have + to do anything here. */ return __nanosleep (&ts, NULL); } |