--- libaitsched/src/hooks.c	2013/05/30 09:13:52	1.17
+++ libaitsched/src/hooks.c	2013/08/15 14:53:49	1.18.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.17 2013/05/30 09:13:52 misho Exp $
+* $Id: hooks.c,v 1.18.4.1 2013/08/15 14:53:49 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -162,6 +162,8 @@ sched_hook_cancel(void *task, void *arg __unused)
 #else
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
+			/* restore signal */
+			signal(TASK_VAL(t), SIG_DFL);
 			break;
 #ifdef AIO_SUPPORT
 		case taskAIO:
@@ -339,11 +341,11 @@ sched_hook_alarm(void *task, void *arg __unused)
 		return (void*) -1;
 
 #ifdef __NetBSD__
-	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 
+	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_CLEAR, 0, 
 			t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, 
 			(intptr_t) TASK_DATA(t));
 #else
-	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 
+	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_CLEAR, 0, 
 			t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, 
 			(void*) TASK_DATA(t));
 #endif
@@ -447,10 +449,13 @@ sched_hook_signal(void *task, void *arg __unused)
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
 
+	/* ignore signal */
+	signal(TASK_VAL(t), SIG_IGN);
+
 #ifdef __NetBSD__
-	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD, 0, 0, (intptr_t) TASK_VAL(t));
+	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_VAL(t));
 #else
-	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD, 0, 0, (void*) TASK_VAL(t));
+	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_VAL(t));
 #endif
 	if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		if (TASK_ROOT(t)->root_hooks.hook_exec.exception)