54da5be39c
* hurd/thread-cancel.c: New file. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): In rpc_wait case, frob mach_msg args to set timeout on receive. (_hurdsig_rcv_interrupted_p): Function removed. * sysdeps/mach/hurd/alpha/trampoline.c: Likewise. * sysdeps/mach/hurd/hppa/trampoline.c: Likewise. * sysdeps/mach/hurd/mips/trampoline.c: Likewise. * hurd/intr-msg.c: New file. * hurd/hurd/signal.h (struct hurd_sigstate): New member `cancel'. (_hurdsig_rcv_interrupted_p): Declaration removed. (HURD_EINTR_RPC): Macro removed. (_hurd_longjmp_thread_state, _hurd_interrupted_rpc_timeout): Declare these. * hurd/intr-rpc.h: New file. * hurd/intr-rpc.defs: Just import intr-rpc.h. * hurd/hurdsig.c (_hurd_interrupted_rpc_timeout): New variable. (interrupted_reply_port_location): Take new flag arg; only catch faults if it's set. (abort_rpcs): Rename to _hurdsig_abort_rpcs; take same new flag arg. No longer use _hurdsig_rcv_interrupted_p; instead compare PC to &_hurd_intr_rpc_msg_in_trap. If before it, mutate state to simulate MACH_SEND_INTERRUPTED return; on it, interrupt the operation. All callers changed. * hurd/hurd.h (hurd_thread_cancel, hurd_check_cancel): Declare these. * hurd/Makefile (distribute): Remove intr-rpc.awk. (sig): Add thread-cancel. (transform-user-stub, transform-user-stub-output): Variables removed. * sysdeps/mach/hurd/dl-sysdep.c: Change all RPCs from `__hurd_intr_rpc_*' to `__*'. (_hurd_intr_rpc_mach_msg): New function. (_hurd_thread_sigstate): Function removed. * sysdeps/mach/hurd/ioctl.c: Use _hurd_intr_rpc_mach_msg function, instead of __mach_msg inside HURD_EINTR_RPC macro. * sysdeps/generic/morecore.c [__GNU_LIBRARY__]: Declare `__sbrk' to take ptrdiff_t arg. * sysdeps/mach/hurd/fork.c: Remove _hurd_longjmp_thread_state decl. * sysdeps/mach/hurd/kill.c (kill_pid): Don't make `inline'. * libc-symbols.h [GCC >= 2.7] (strong_alias, weak_symbol, weak_alias): Use `extern' storage class.
143 lines
4.5 KiB
C
143 lines
4.5 KiB
C
/* Copyright (C) 1991, 1992, 1993, 1994, 1995 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <sys/types.h>
|
|
#include <signal.h>
|
|
#include <hurd.h>
|
|
#include <hurd/port.h>
|
|
#include <hurd/signal.h>
|
|
#include <hurd/msg.h>
|
|
|
|
/* Send signal SIG to process number PID. If PID is zero,
|
|
send SIG to all processes in the current process's process group.
|
|
If PID is < -1, send SIG to all processes in process group - PID. */
|
|
int
|
|
__kill (pid_t pid, int sig)
|
|
{
|
|
int delivered = 0; /* Set when we deliver any signal. */
|
|
error_t err;
|
|
mach_port_t proc;
|
|
struct hurd_userlink ulink;
|
|
|
|
inline void kill_pid (pid_t pid) /* Kill one PID. */
|
|
{
|
|
/* SIGKILL is not delivered as a normal signal.
|
|
Sending SIGKILL to a process means to terminate its task. */
|
|
if (sig == SIGKILL)
|
|
/* Fetch the process's task port and terminate the task. We
|
|
loop in case the process execs and changes its task port.
|
|
If the old task port dies after we fetch it but before we
|
|
send the RPC, we get MACH_SEND_INVALID_DEST; if it dies
|
|
after we send the RPC request but before it is serviced, we
|
|
get MIG_SERVER_DIED. */
|
|
do
|
|
{
|
|
task_t refport;
|
|
err = __proc_pid2task (proc, pid, &refport);
|
|
if (!err)
|
|
{
|
|
err = __task_terminate (refport);
|
|
__mach_port_deallocate (__mach_task_self (), refport);
|
|
}
|
|
} while (err == MACH_SEND_INVALID_DEST ||
|
|
err == MIG_SERVER_DIED);
|
|
else
|
|
{
|
|
error_t taskerr;
|
|
error_t kill_port (mach_port_t msgport, mach_port_t refport)
|
|
{
|
|
if (msgport != MACH_PORT_NULL)
|
|
/* Send a signal message to his message port. */
|
|
return __msg_sig_post (msgport, sig, refport);
|
|
|
|
/* The process has no message port. Perhaps try direct
|
|
frobnication of the task. */
|
|
|
|
if (taskerr)
|
|
/* If we could not get the task port, we can do nothing. */
|
|
return taskerr;
|
|
|
|
/* For user convenience in the case of a task that has
|
|
not registered any message port with the proc server,
|
|
translate a few signals to direct task operations. */
|
|
switch (sig)
|
|
{
|
|
/* The only signals that really make sense for an
|
|
unregistered task are kill, suspend, and continue. */
|
|
case SIGSTOP:
|
|
case SIGTSTP:
|
|
return __task_suspend (refport);
|
|
case SIGCONT:
|
|
return __task_resume (refport);
|
|
case SIGQUIT:
|
|
case SIGINT:
|
|
return __task_terminate (refport);
|
|
default:
|
|
/* We have full permission to send signals, but there is
|
|
no meaningful way to express this signal. */
|
|
return EPERM;
|
|
}
|
|
}
|
|
err = HURD_MSGPORT_RPC (__proc_getmsgport (proc, pid, &msgport),
|
|
(taskerr = __proc_pid2task (proc, pid,
|
|
&refport)) ?
|
|
__proc_getsidport (proc, &refport) : 0, 1,
|
|
kill_port (msgport, refport));
|
|
}
|
|
if (! err)
|
|
delivered = 1;
|
|
}
|
|
|
|
proc = _hurd_port_get (&_hurd_ports[INIT_PORT_PROC], &ulink);
|
|
|
|
if (pid <= 0)
|
|
{
|
|
/* Send SIG to each process in pgrp (- PID). */
|
|
pid_t pidbuf[10], *pids = pidbuf;
|
|
mach_msg_type_number_t i, npids = sizeof (pidbuf) / sizeof (pidbuf[0]);
|
|
|
|
err = __proc_getpgrppids (proc, - pid, &pids, &npids);
|
|
if (!err)
|
|
{
|
|
for (i = 0; i < npids; ++i)
|
|
{
|
|
kill_pid (pids[i]);
|
|
if (err == ESRCH)
|
|
/* The process died already. Ignore it. */
|
|
err = 0;
|
|
}
|
|
if (pids != pidbuf)
|
|
__vm_deallocate (__mach_task_self (),
|
|
(vm_address_t) pids, npids * sizeof (pids[0]));
|
|
}
|
|
}
|
|
else
|
|
kill_pid (pid);
|
|
|
|
_hurd_port_free (&_hurd_ports[INIT_PORT_PROC], &ulink, proc);
|
|
|
|
/* If we delivered no signals, but ERR is clear, this must mean that
|
|
every kill_pid call failed with ESRCH, meaning all the processes in
|
|
the pgrp died between proc_getpgrppids and kill_pid; in that case we
|
|
fail with ESRCH. */
|
|
return delivered ? 0 : __hurd_fail (err ?: ESRCH);
|
|
}
|
|
|
|
weak_alias (__kill, kill)
|