--- libaitsched/src/hooks.c	2012/08/22 10:33:45	1.14.2.1
+++ libaitsched/src/hooks.c	2012/08/23 02:33:12	1.15
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.14.2.1 2012/08/22 10:33:45 misho Exp $
+* $Id: hooks.c,v 1.15 2012/08/23 02:33:12 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -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 */
 
@@ -210,12 +210,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 		case taskTHREAD:
 #ifdef HAVE_LIBPTHREAD
 			pthread_cancel((pthread_t) TASK_VAL(t));
-			while (!pthread_kill((pthread_t) TASK_VAL(t), 0));
-			if (TASK_FLAG(t) == PTHREAD_CREATE_JOINABLE)	/* joinable thread */
-				schedTask(TASK_ROOT(t), _sched_threadJoin, TASK_ARG(t),
-						TASK_VAL(t), TASK_DATA(t), TASK_DATLEN(t));
 #endif
-			TASK_UNLOCK(t);
 		default:
 			return NULL;
 	}
@@ -237,20 +232,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;
 
+	sigfillset(&s);
+	pthread_sigmask(SIG_BLOCK, &s, &o);
 	if (pthread_create(&tid, (pthread_attr_t*) arg, 
-				(void *(*)(void*)) TASK_FUNC(t), t)) {
+				(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