diff options
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/catch-exc.c | 13 | ||||
| -rw-r--r-- | hurd/hurd-raise.c | 7 | ||||
| -rw-r--r-- | hurd/hurd/signal.h | 5 | ||||
| -rw-r--r-- | hurd/hurdfault.c | 12 | ||||
| -rw-r--r-- | hurd/hurdprio.c | 4 | ||||
| -rw-r--r-- | hurd/hurdsig.c | 34 | ||||
| -rw-r--r-- | hurd/report-wait.c | 25 |
7 files changed, 66 insertions, 34 deletions
diff --git a/hurd/catch-exc.c b/hurd/catch-exc.c index 8ab38a2a61..e3186eb0cd 100644 --- a/hurd/catch-exc.c +++ b/hurd/catch-exc.c @@ -29,18 +29,21 @@ _S_catch_exception_raise (mach_port_t port, int code, int subcode) { - int signo, error; - long int sigcode; struct hurd_sigstate *ss; + int signo; + struct hurd_signal_detail d; if (task != __mach_task_self ()) /* The sender wasn't the kernel. */ return EPERM; + d.exc = exception; + d.exc_code = code; + d.exc_subcode = subcode; + /* Call the machine-dependent function to translate the Mach exception codes into a signal number and subcode. */ - _hurd_exception2signal (exception, code, subcode, - &signo, &sigcode, &error); + _hurd_exception2signal (&d, &signo); /* Find the sigstate structure for the faulting thread. */ __mutex_lock (&_hurd_siglock); @@ -70,7 +73,7 @@ _S_catch_exception_raise (mach_port_t port, } /* Post the signal. */ - _hurd_internal_post_signal (ss, signo, sigcode, error, + _hurd_internal_post_signal (ss, signo, &d, MACH_PORT_NULL, MACH_MSG_TYPE_PORT_SEND, 0); diff --git a/hurd/hurd-raise.c b/hurd/hurd-raise.c index 59179da5f6..8ebe2c8ff3 100644 --- a/hurd/hurd-raise.c +++ b/hurd/hurd-raise.c @@ -27,7 +27,7 @@ Cambridge, MA 02139, USA. */ void _hurd_raise_signal (struct hurd_sigstate *ss, - int signo, long int sigcode, int sigerror) + int signo, const struct hurd_signal_detail *detail) { if (ss == NULL) { @@ -37,12 +37,11 @@ _hurd_raise_signal (struct hurd_sigstate *ss, /* Mark SIGNO as pending to be delivered. */ __sigaddset (&ss->pending, signo); - ss->pending_data[signo].code = sigcode; - ss->pending_data[signo].error = sigerror; + ss->pending_data[signo] = *detail; __spin_unlock (&ss->lock); /* Send a message to the signal thread so it will wake up and check for pending signals. */ - __msg_sig_post (_hurd_msgport, signo, sigcode, __mach_task_self ()); + __msg_sig_post (_hurd_msgport, signo, detail->code, __mach_task_self ()); } diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 27349d3ed0..7dee18c1ed 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -233,7 +233,8 @@ extern void _hurd_raise_signal (struct hurd_sigstate *ss, int signo, /* Translate a Mach exception into a signal (machine-dependent). */ -extern void _hurd_exception2signal (struct hurd_signal_detail *); +extern void _hurd_exception2signal (struct hurd_signal_detail *detail, + int *signo); /* Make the thread described by SS take the signal described by SIGNO and @@ -259,7 +260,7 @@ extern void _hurd_internal_post_signal (struct hurd_sigstate *ss, struct machine_thread_all_state; extern struct sigcontext * _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, - int signo, const struct hurd_signal_detail *detail, + int signo, struct hurd_signal_detail *detail, int rpc_wait, struct machine_thread_all_state *state); /* Function run by the signal thread to receive from the signal port. */ diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c index bb6fa9576d..a8fe8fb07f 100644 --- a/hurd/hurdfault.c +++ b/hurd/hurdfault.c @@ -42,19 +42,21 @@ _hurdsig_fault_catch_exception_raise (mach_port_t port, int subcode) { int signo; - long int sigcode; - int sigerror; + struct hurd_signal_detail d; if (port != forward_sigexc || thread != _hurd_msgport_thread || task != __mach_task_self ()) return EPERM; /* Strange bogosity. */ + d.exc = exception; + d.exc_code = code; + d.exc_subcode = subcode; + /* Call the machine-dependent function to translate the Mach exception codes into a signal number and subcode. */ - _hurd_exception2signal (exception, code, subcode, - &signo, &sigcode, &sigerror); + _hurd_exception2signal (&d, &signo); - return HURD_PREEMPT_SIGNAL_P (&_hurdsig_fault_preempter, signo, sigcode) + return HURD_PREEMPT_SIGNAL_P (&_hurdsig_fault_preempter, signo, d.code) ? 0 : EGREGIOUS; } diff --git a/hurd/hurdprio.c b/hurd/hurdprio.c index bbbe317406..66ef41656d 100644 --- a/hurd/hurdprio.c +++ b/hurd/hurdprio.c @@ -1,5 +1,5 @@ /* Support code for dealing with priorities in the Hurd. -Copyright (C) 1994, 1995 Free Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996 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 @@ -62,7 +62,7 @@ _hurd_priority_which_map (enum __priority_which which, int who, char *tw = 0; size_t twsz = 0; if (err = __USEPORT (PROC, __proc_getprocinfo (port, pids[i], - pi_flags, + &pi_flags, &pi, &pisize, &tw, &twsz))) continue; diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index 2a517cfa5a..710d8d915a 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -130,7 +130,7 @@ int _hurd_core_limit; /* XXX */ /* Call the crash dump server to mummify us before we die. Returns nonzero if a core file was written. */ static int -write_corefile (int signo, long int sigcode, int sigerror) +write_corefile (int signo, const struct hurd_signal_detail *detail) { error_t err; mach_port_t coreserver; @@ -168,13 +168,16 @@ write_corefile (int signo, long int sigcode, int sigerror) /* Call the core dumping server to write the core file. */ err = __crash_dump_task (coreserver, __mach_task_self (), - file, _hurdsig_getenv ("GNUTARGET"), - signo, sigcode, sigerror); + file, + signo, detail->code, detail->error, + detail->exc, detail->exc_code, detail->exc_subcode, + _hurd_ports[INIT_PORT_CTTYID].port, + MACH_MSG_TYPE_COPY_SEND); __mach_port_deallocate (__mach_task_self (), coreserver); if (! err) /* The core dump into FILE succeeded, so now link it into the directory. */ - err = __dir_link (file, coredir, name); + err = __dir_link (file, coredir, name, 1); __mach_port_deallocate (__mach_task_self (), file); __mach_port_deallocate (__mach_task_self (), coredir); return !err; @@ -477,7 +480,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, __mutex_unlock (&_hurd_siglock); abort_all_rpcs (signo, &thread_state, 1); reply (); - __proc_mark_stop (port, signo); + __proc_mark_stop (port, signo, detail->code); })); _hurd_stopped = 1; } @@ -546,8 +549,8 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, { __mutex_lock (&_hurd_siglock); for (pe = _hurdsig_preempters; pe && handler == SIG_ERR; pe = pe->next) - if (HURD_PREEMPT_SIGNAL_P (pe, signo, sigcode)) - handler = (*pe->preempter) (pe, ss, &signo, &sigcode, &sigerror); + if (HURD_PREEMPT_SIGNAL_P (pe, signo, detail->code)) + handler = (*pe->preempter) (pe, ss, &signo, detail); __mutex_unlock (&_hurd_siglock); } @@ -664,7 +667,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, /* If we would ordinarily stop for a job control signal, but we are orphaned so noone would ever notice and continue us again, we just quietly die, alone and in the dark. */ - sigcode = signo; + detail->code = signo; signo = SIGKILL; act = term; } @@ -686,7 +689,8 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, /* We are already stopped, but receiving an untraced stop signal. Instead of resuming and suspending again, just notify the proc server of the new stop signal. */ - error_t err = __USEPORT (PROC, __proc_mark_stop (port, signo)); + error_t err = __USEPORT (PROC, __proc_mark_stop + (port, signo, detail->code)); assert_perror (err); } else @@ -701,7 +705,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, sigbomb: /* We got a fault setting up the stack frame for the handler. Nothing to do but die; BSD gets SIGILL in this case. */ - sigcode = signo; /* XXX ? */ + detail->code = signo; /* XXX ? */ signo = SIGILL; act = core; /* FALLTHROUGH */ @@ -721,7 +725,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, int status = W_EXITCODE (0, signo); /* Do a core dump if desired. Only set the wait status bit saying we in fact dumped core if the operation was actually successful. */ - if (act == core && write_corefile (signo, sigcode, sigerror)) + if (act == core && write_corefile (signo, detail)) status |= WCOREFLAG; /* Tell proc how we died and then stick the saber in the gut. */ _hurd_exit (status); @@ -808,8 +812,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, /* Call the machine-dependent function to set the thread up to run the signal handler, and preserve its old context. */ - scp = _hurd_setup_sighandler (ss, handler, - signo, sigcode, + scp = _hurd_setup_sighandler (ss, handler, signo, detail, wait_for_reply, &thread_state); if (scp == NULL) goto sigbomb; @@ -848,7 +851,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, } /* Backdoor extra argument to signal handler. */ - scp->sc_error = sigerror; + scp->sc_error = detail->error; /* Block SIGNO and requested signals while running the handler. */ scp->sc_mask = ss->blocked; @@ -897,8 +900,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, if (__sigismember (&pending, signo)) { __sigdelset (&ss->pending, signo); - sigcode = ss->pending_data[signo].code; - sigerror = ss->pending_data[signo].error; + *detail = ss->pending_data[signo]; __spin_unlock (&ss->lock); goto post_signal; } diff --git a/hurd/report-wait.c b/hurd/report-wait.c index 35cf7c1a61..7fc92935bf 100644 --- a/hurd/report-wait.c +++ b/hurd/report-wait.c @@ -149,3 +149,28 @@ _S_msg_report_wait (mach_port_t msgport, thread_t thread, __mach_port_deallocate (__mach_task_self (), thread); return 0; } + +kern_return_t +_S_msg_describe_ports (mach_port_t msgport, mach_port_t refport, + mach_port_t *ports, mach_msg_type_number_t nports, + char **desc, mach_msg_type_number_t *desclen) +{ + char *p, *end; + + if (__USEPORT (AUTH, msgport != port)) + return EPERM; + + end = *desc + *desclen; + p = *desc; + while (nports-- > 0) + { + char this[200]; + describe_port (this, *ports++); + p = __stpncpy (p, this, end - p); + if (p == end && p[-1] != '\0') + return ENOMEM; + } + + *desclen = p - *desc; + return 0; +} |