--- libaitsched/src/aitsched.c	2012/08/08 23:04:41	1.14
+++ libaitsched/src/aitsched.c	2012/08/22 23:43:36	1.15.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.14 2012/08/08 23:04:41 misho Exp $
+* $Id: aitsched.c,v 1.15.2.2 2012/08/22 23:43:36 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -108,6 +108,9 @@ schedRegisterHooks(sched_root_task_t * __restrict root
 #ifdef EVFILT_USER
 	root->root_hooks.hook_add.user = sched_hook_user;
 #endif
+#ifdef HAVE_LIBPTHREAD
+	root->root_hooks.hook_add.thread = sched_hook_thread;
+#endif
 
 	root->root_hooks.hook_exec.cancel = sched_hook_cancel;
 	root->root_hooks.hook_exec.fetch = sched_hook_fetch;
@@ -175,6 +178,7 @@ schedInit(void ** __restrict data, size_t datlen)
 		TAILQ_INIT(&root->root_suspend);
 		TAILQ_INIT(&root->root_ready);
 		TAILQ_INIT(&root->root_unuse);
+		TAILQ_INIT(&root->root_thread);
 
 #ifdef HAVE_LIBPTHREAD
 		for (i = 0; i < taskMAX; i++)
@@ -238,12 +242,14 @@ schedEnd(sched_root_task_t ** __restrict root)
 		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp)
 		schedCancel(task);
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp)
-		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_suspend, task_node, tmp)
 		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp)
 		schedCancel(task);
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_thread, task_node, tmp)
+		schedCancel(task);
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp)
+		schedCancel(task);
 
 #ifdef HAVE_LIBPTHREAD
 	pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]);
@@ -408,6 +414,9 @@ schedCancel(sched_task_t * __restrict task)
 		case taskREADY:
 			queue = &TASK_ROOT(task)->root_ready;
 			break;
+		case taskTHREAD:
+			queue = &TASK_ROOT(task)->root_thread;
+			break;
 		default:
 			queue = NULL;
 	}
@@ -421,7 +430,7 @@ schedCancel(sched_task_t * __restrict task)
 #endif
 	}
 	if (TASK_TYPE(task) != taskUNUSE)
-		_sched_unuseTask(task);
+		sched_unuseTask(task);
 
 	return 0;
 }
@@ -477,6 +486,8 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 			return -2;
 		if (schedCancelby(root, taskREADY, criteria, param, hook))
 			return -2;
+		if (schedCancelby(root, taskTHREAD, criteria, param, hook))
+			return -2;
 		return 0;
 	}
 	/* choosen queue */
@@ -523,6 +534,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 		case taskREADY:
 			queue = &root->root_ready;
 			break;
+		case taskTHREAD:
+			queue = &root->root_thread;
+			break;
 		default:
 			return 0;
 	}
@@ -583,7 +597,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 
 			TAILQ_REMOVE(queue, task, task_node);
 			if (TASK_TYPE(task) != taskUNUSE)
-				_sched_unuseTask(task);
+				sched_unuseTask(task);
 
 			flg ^= flg;	/* ok */
 		}