diff options
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurdfault.c | 13 | ||||
| -rw-r--r-- | hurd/hurdinit.c | 9 | ||||
| -rw-r--r-- | hurd/hurdsig.c | 12 |
3 files changed, 31 insertions, 3 deletions
diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c index 3c17cc0236..e761d36fe1 100644 --- a/hurd/hurdfault.c +++ b/hurd/hurdfault.c @@ -1,5 +1,5 @@ /* Handle faults in the signal thread. - Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1994,95,96,97,2002 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 @@ -156,8 +156,19 @@ _hurdsig_fault_init (void) assert_perror (err); /* Direct signal thread exceptions to the proc server. */ +#ifdef THREAD_EXCEPTION_PORT err = __thread_set_special_port (_hurd_msgport_thread, THREAD_EXCEPTION_PORT, sigexc); +#elif defined (EXC_MASK_ALL) + __thread_set_exception_ports (_hurd_msgport_thread, + EXC_MASK_ALL & ~(EXC_MASK_SYSCALL + | EXC_MASK_MACH_SYSCALL + | EXC_MASK_RPC_ALERT), + sigexc, + EXCEPTION_DEFAULT, MACHINE_THREAD_STATE); +#else +# error thread_set_exception_ports? +#endif __mach_port_deallocate (__mach_task_self (), sigexc); assert_perror (err); } diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c index dc5e904c5e..7a57031d62 100644 --- a/hurd/hurdinit.c +++ b/hurd/hurdinit.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1992,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc. +/* Copyright (C) 1992,93,94,95,96,97,98,99,2000,01 + 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 @@ -39,6 +40,12 @@ int __libc_argc; error_t _hurd_ports_use (int which, error_t (*operate) (mach_port_t)) { + if (__builtin_expect (_hurd_ports == NULL, 0)) + /* This means that _hurd_init has not been called yet, which is + normally only the case in the bootstrap filesystem, and there + only in the early phases of booting. */ + return EGRATUITOUS; + return HURD_PORT_USE (&_hurd_ports[which], (*operate) (port)); } diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index 748d8406c1..34b28d94da 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -1030,7 +1030,6 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, msg.msgh_local_port = MACH_PORT_NULL; /* These values do not matter. */ msg.msgh_id = 8675309; /* Jenny, Jenny. */ - msg.msgh_seqno = 17; /* Random. */ ss->suspended = MACH_PORT_NULL; err = __mach_msg (&msg, MACH_SEND_MSG, sizeof msg, 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, @@ -1300,8 +1299,19 @@ _hurdsig_init (const int *intarray, size_t intarraysize) } /* Receive exceptions on the signal port. */ +#ifdef TASK_EXCEPTION_PORT __task_set_special_port (__mach_task_self (), TASK_EXCEPTION_PORT, _hurd_msgport); +#elif defined (EXC_MASK_ALL) + __task_set_exception_ports (__mach_task_self (), + EXC_MASK_ALL & ~(EXC_MASK_SYSCALL + | EXC_MASK_MACH_SYSCALL + | EXC_MASK_RPC_ALERT), + _hurd_msgport, + EXCEPTION_DEFAULT, MACHINE_THREAD_STATE); +#else +# error task_set_exception_port? +#endif /* Sanity check. Any pending, unblocked signals should have been taken by our predecessor incarnation (i.e. parent or pre-exec state) |