lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +03:00
Code Activity

Thu Jan 4 11:35:18 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

Browse Source 
* sysdeps/mach/hurd/setitimer.c: Code rearranged a bit to use new
	preemption interface.

	* sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler):
	Use _hurdsig_catch_memory_fault.

	* hurd/Makefile (headers): Add hurd/sigpreempt.h.
	(sig): Add catch-signal.

	* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
	Rewritten using a preempter in new interface.
	* hurd/hurdfault.h (_hurdsig_catch_fault): Likewise.
	(_hurdsig_catch_memory_fault): New macro.
This commit is contained in:
Roland McGrath
1996-01-04 17:00:45 +00:00
parent fb8e70d6dd
commit 7974fe2117
6 changed files with 101 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sysdeps/mach/hurd/setitimer.c
View File

@@ -1,4 +1,4 @@
/* 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
@@ -22,6 +22,7 @@ Cambridge, MA 02139, USA. */
#include <sys/time.h>
#include <hurd.h>
#include <hurd/signal.h>
#include <hurd/sigpreempt.h>
#include <hurd/msg_request.h>
#include <mach/message.h>
@@ -109,9 +110,29 @@ timer_thread (void)
}
}
/* Forward declaration. */
static sighandler_t preempt_sigalrm (thread_t thread, int signo,
long int sigcode, int sigerror);
static sighandler_t
restart_itimer (struct hurd_signal_preempter *preempter,
struct hurd_sigstate *ss,
int *signo, long int *sigcode,
int *sigerror)
{
static int setitimer_locked (const struct itimerval *new,
struct itimerval *old, void *crit);
/* This function gets called in the signal thread
each time a SIGALRM is arriving (even if blocked). */
struct itimerval it;
/* Either reload or disable the itimer. */
__spin_lock (&_hurd_itimer_lock);
it.it_value = it.it_interval = _hurd_itimerval.it_interval;
setitimer_locked (&it, NULL, NULL);
/* Continue with normal delivery (or hold, etc.) of SIGALRM. */
return SIG_ERR;
}
/* Called before any normal SIGALRM signal is delivered.
Reload the itimer, or disable the itimer. */
@@ -138,12 +159,20 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old,
{
/* Make sure the itimer thread is set up. */
if (_hurd_signal_preempt[SIGALRM] == NULL)
/* Set up a signal preempter global for all threads to
run `restart_itimer' each time a SIGALRM would arrive. */
static struct hurd_signal_preempter preempter =
{
static struct hurd_signal_preempt preempt =
{ preempt_sigalrm, 0, 0, NULL };
_hurd_signal_preempt[SIGALRM] = &preempt;
__sigmask (SIGALRM), 0, 0,
&restart_itimer,
};
__mutex_lock (&_hurd_siglock);
if (! preempter.next && _hurdsig_preempters != &preempter)
{
preempter.next = _hurdsig_preempters;
_hurdsig_preempters = &preempter;
}
__mutex_unlock (&_hurd_siglock);
if (_hurd_itimer_port == MACH_PORT_NULL)
{
@@ -170,7 +199,7 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old,
&_hurd_itimer_thread_stack_size))
{
__thread_terminate (_hurd_itimer_thread);
_hurd_itimer_thread = MACH_PORT_NULL;
_hurd_itimer_thread = MACH_PORT_NULL;
goto out;
}
_hurd_itimer_thread_suspended = 1;
@@ -293,25 +322,6 @@ DEFUN(__setitimer, (which, new, old),
__spin_lock (&_hurd_itimer_lock);
return setitimer_locked (new, old, crit);
}
static sighandler_t
preempt_sigalrm (thread_t thread, int signo, long int sigcode, int sigerror)
{
struct itimerval it;
if (thread != _hurd_sigthread || signo != SIGALRM || sigcode != 0)
/* Too much monkey business. */
return SIG_DFL;
/* Either reload or disable the itimer. */
__spin_lock (&_hurd_itimer_lock);
it = _hurd_itimerval;
it.it_value = it.it_interval;
setitimer_locked (&it, NULL, NULL);
/* Continue with normal delivery of SIGALRM. */
return SIG_DFL;
}
static void
fork_itimer (void)