--- libaitsched/src/hooks.c	2012/08/21 11:07:16	1.13.2.1
+++ libaitsched/src/hooks.c	2012/08/22 10:33:45	1.14.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.13.2.1 2012/08/21 11:07:16 misho Exp $
+* $Id: hooks.c,v 1.14.2.1 2012/08/22 10:33:45 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -210,7 +210,12 @@ 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;
 	}
@@ -219,7 +224,38 @@ sched_hook_cancel(void *task, void *arg __unused)
 	return NULL;
 }
 
+#ifdef HAVE_LIBPTHREAD
 /*
+ * sched_hook_thread() - Default THREAD hook
+ *
+ * @task = current task
+ * @arg = pthread attributes
+ * return: <0 errors and 0 ok
+ */
+void *
+sched_hook_thread(void *task, void *arg)
+{
+	sched_task_t *t = task;
+	pthread_t tid;
+
+	if (!t || !TASK_ROOT(t))
+		return (void*) -1;
+
+	if (pthread_create(&tid, (pthread_attr_t*) arg, 
+				(void *(*)(void*)) TASK_FUNC(t), t)) {
+		LOGERR;
+		return (void*) -1;
+	}
+
+	if (!TASK_ISLOCKED(t))
+		TASK_LOCK(t);
+
+	TASK_VAL(t) = (u_long) tid;
+	return NULL;
+}
+#endif
+
+/*
  * sched_hook_read() - Default READ hook
  *
  * @task = current task
@@ -596,8 +632,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove read handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskREAD]);
@@ -646,8 +685,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove write handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskWRITE]);
@@ -696,8 +738,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) {
 					if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove alarm handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskALARM]);
@@ -726,8 +771,8 @@ sched_hook_fetch(void *root, void *arg __unused)
 						continue;
 					else {
 						flg++;
-						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
-						TASK_DATLEN(task) = res[i].fflags;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
 					}
 					/* remove node handle */
 #ifdef HAVE_LIBPTHREAD
@@ -757,8 +802,8 @@ sched_hook_fetch(void *root, void *arg __unused)
 						continue;
 					else {
 						flg++;
-						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
-						TASK_DATLEN(task) = res[i].fflags;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
 					}
 					/* remove proc handle */
 #ifdef HAVE_LIBPTHREAD
@@ -786,8 +831,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) {
 					if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove signal handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskSIGNAL]);
@@ -816,8 +864,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 					acb = (struct aiocb*) TASK_VAL(task);
 					if (acb != ((struct aiocb*) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskAIO]);
@@ -855,8 +906,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 					acbs = (struct aiocb**) TASK_VAL(task);
 					if (acbs != ((struct aiocb**) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskLIO]);
@@ -904,8 +958,8 @@ sched_hook_fetch(void *root, void *arg __unused)
 						continue;
 					else {
 						flg++;
-						TASK_DATA(task) = (void*) res[i].data;
-						TASK_DATLEN(task) = res[i].fflags;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
 					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD