--- libaitsched/src/hooks.c	2012/08/21 12:50:08	1.13.2.3
+++ libaitsched/src/hooks.c	2012/08/22 23:47:22	1.14.2.4
@@ -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.14.2.4 2012/08/22 23:47:22 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -107,11 +107,11 @@ sched_hook_cancel(void *task, void *arg __unused)
 	sched_task_t *t = task;
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
+	register int i = 0;
 #ifdef AIO_SUPPORT
 	struct aiocb *acb;
 #ifdef EVFILT_LIO
 	struct aiocb **acbs;
-	register int i;
 #endif	/* EVFILT_LIO */
 #endif	/* AIO_SUPPORT */
 
@@ -209,7 +209,17 @@ sched_hook_cancel(void *task, void *arg __unused)
 #endif
 		case taskTHREAD:
 #ifdef HAVE_LIBPTHREAD
-			pthread_cancel((pthread_t) TASK_VAL(t));
+			/* try to wait for valid thread id */
+			for (i = 0; i < MAX_TASK_MISS && 
+					pthread_kill((pthread_t) TASK_VAL(t), 0); i++)
+				usleep(10);
+			/* try to sure thread is cancelled */
+			for (i = 0; i < MAX_TASK_MISS && 
+					!pthread_kill((pthread_t) TASK_VAL(t), 0); i++)
+				pthread_cancel((pthread_t) TASK_VAL(t));
+			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:
@@ -233,13 +243,17 @@ sched_hook_thread(void *task, void *arg)
 {
 	sched_task_t *t = task;
 	pthread_t tid;
+	sigset_t ns, os;
 
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
 
+	sigfillset(&ns);
+	pthread_sigmask(SIG_BLOCK, &ns, &os);
 	if (pthread_create(&tid, (pthread_attr_t*) arg, 
 				(void *(*)(void*)) TASK_FUNC(t), t)) {
 		LOGERR;
+		pthread_sigmask(SIG_SETMASK, &os, NULL);
 		return (void*) -1;
 	}
 
@@ -247,6 +261,7 @@ sched_hook_thread(void *task, void *arg)
 		TASK_LOCK(t);
 
 	TASK_VAL(t) = (u_long) tid;
+	pthread_sigmask(SIG_SETMASK, &os, NULL);
 	return NULL;
 }
 #endif