--- libaitsched/src/hooks.c	2012/08/21 12:50:08	1.13.2.3
+++ 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.13.2.3 2012/08/21 12:50:08 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
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -110,8 +110,8 @@ sched_hook_cancel(void *task, void *arg __unused)
 #ifdef AIO_SUPPORT
 	struct aiocb *acb;
 #ifdef EVFILT_LIO
+	register int i = 0;
 	struct aiocb **acbs;
-	register int i;
 #endif	/* EVFILT_LIO */
 #endif	/* AIO_SUPPORT */
 
@@ -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:
@@ -211,7 +213,6 @@ sched_hook_cancel(void *task, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 			pthread_cancel((pthread_t) TASK_VAL(t));
 #endif
-			TASK_UNLOCK(t);
 		default:
 			return NULL;
 	}
@@ -233,20 +234,25 @@ sched_hook_thread(void *task, void *arg)
 {
 	sched_task_t *t = task;
 	pthread_t tid;
+	sigset_t s, o;
 
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
 
-	if (pthread_create(&tid, (pthread_attr_t*) arg, 
-				(void *(*)(void*)) TASK_FUNC(t), t)) {
+	sigfillset(&s);
+	pthread_sigmask(SIG_BLOCK, &s, &o);
+	if ((errno = pthread_create(&tid, (pthread_attr_t*) arg, 
+				(void *(*)(void*)) _sched_threadWrapper, t))) {
 		LOGERR;
+		pthread_sigmask(SIG_SETMASK, &o, NULL);
 		return (void*) -1;
-	}
+	} else
+		TASK_VAL(t) = (u_long) tid;
 
 	if (!TASK_ISLOCKED(t))
 		TASK_LOCK(t);
 
-	TASK_VAL(t) = (u_long) tid;
+	pthread_sigmask(SIG_SETMASK, &o, NULL);
 	return NULL;
 }
 #endif
@@ -335,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
@@ -443,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)