--- libaitsched/src/hooks.c	2012/08/22 23:43:36	1.14.2.3
+++ libaitsched/src/hooks.c	2013/05/30 09:13:52	1.17
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.14.2.3 2012/08/22 23:43:36 misho Exp $
+* $Id: hooks.c,v 1.17 2013/05/30 09:13:52 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 */
 
@@ -209,19 +209,8 @@ sched_hook_cancel(void *task, void *arg __unused)
 #endif
 		case taskTHREAD:
 #ifdef HAVE_LIBPTHREAD
-			/* 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));
+			pthread_cancel((pthread_t) TASK_VAL(t));
 #endif
-			TASK_UNLOCK(t);
 		default:
 			return NULL;
 	}
@@ -243,25 +232,25 @@ sched_hook_thread(void *task, void *arg)
 {
 	sched_task_t *t = task;
 	pthread_t tid;
-	sigset_t ns, os;
+	sigset_t s, o;
 
 	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)) {
+	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, &os, NULL);
+		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, &os, NULL);
+	pthread_sigmask(SIG_SETMASK, &o, NULL);
 	return NULL;
 }
 #endif