diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-03-11 19:02:26 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-11 19:02:26 +0000 |
commit | f006d3a007b7caffd4c810fa71623b39334a1580 (patch) | |
tree | 77aa3aa11ab6c527e257648a6c7da97e233dd134 /sysdeps/unix | |
parent | ea69482383319d05bed2d516a2cbb2a19549c1ce (diff) | |
download | glibc-f006d3a007b7caffd4c810fa71623b39334a1580.zip glibc-f006d3a007b7caffd4c810fa71623b39334a1580.tar.gz glibc-f006d3a007b7caffd4c810fa71623b39334a1580.tar.bz2 |
Update.
* sysdeps/unix/sysv/linux/ia64/system.c: New file.
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_CLONE_THREAD_FLAGS): Define for IA-64 and s390* with
kernel >= 2.5.64.
2003-03-11 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S: Don't clobber R7.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/system.c | 74 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 9 |
2 files changed, 83 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/ia64/system.c b/sysdeps/unix/sysv/linux/ia64/system.c new file mode 100644 index 0000000..db4fcfe --- /dev/null +++ b/sysdeps/unix/sysv/linux/ia64/system.c @@ -0,0 +1,74 @@ +/* Copyright (C) 2002, 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sched.h> +#include <signal.h> +#include <sysdep.h> +#include <unistd.h> +#include <sys/wait.h> +#include <bits/libc-lock.h> +#include <kernel-features.h> + +/* We have to and actually can handle cancelable system(). The big + problem: we have to kill the child process if necessary. To do + this a cleanup handler has to be registered and is has to be able + to find the PID of the child. The main problem is to reliable have + the PID when needed. It is not necessary for the parent thread to + return. It might still be in the kernel when the cancellation + request comes. Therefore we have to use the clone() calls ability + to have the kernel write the PID into the user-level variable. */ +#ifdef __ASSUME_CLONE_THREAD_FLAGS +# define FORK() \ + INLINE_SYSCALL (clone2, 6, CLONE_PARENT_SETTID | SIGCHLD, NULL, 0, \ + NULL, &pid, NULL) +#endif + +static void cancel_handler (void *arg); + +#define CLEANUP_HANDLER \ + __libc_cleanup_region_start (1, cancel_handler, &pid) + +#define CLEANUP_RESET \ + __libc_cleanup_region_end (0) + + +/* Linux has waitpid(), so override the generic unix version. */ +#include <sysdeps/posix/system.c> + + +/* The cancellation handler. */ +static void +cancel_handler (void *arg) +{ + pid_t child = *(pid_t *) arg; + + INTERNAL_SYSCALL_DECL (err); + INTERNAL_SYSCALL (kill, err, 2, child, SIGKILL); + + TEMP_FAILURE_RETRY (__waitpid (child, NULL, 0)); + + DO_LOCK (); + + if (SUB_REF () == 0) + { + (void) __sigaction (SIGQUIT, &quit, (struct sigaction *) NULL); + (void) __sigaction (SIGINT, &intr, (struct sigaction *) NULL); + } + + DO_UNLOCK (); +} diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index f9d1f09..53d8860 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -270,3 +270,12 @@ #if __LINUX_KERNEL_VERSION >= 132415 # define __ASSUME_POSIX_TIMERS 1 #endif + +/* The late 2.5 kernels saw a lot of new CLONE_* flags. Summarize + their availability with one define. The changes were made first + for i386 and the have to be done separately for the other archs. + For ia64 and s390* we pick 2.5.64 as the first version with support. */ +#if __LINUX_KERNEL_VERSION >= 132416 \ + && (defined __ia64__ || defined __s390__) +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif |