--- libaitsched/src/aitsched.c	2011/09/09 14:14:33	1.1.1.1.2.5
+++ libaitsched/src/aitsched.c	2011/10/04 14:17:32	1.2.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.1.1.1.2.5 2011/09/09 14:14:33 misho Exp $
+* $Id: aitsched.c,v 1.2.2.3 2011/10/04 14:17:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -104,6 +104,7 @@ schedRegisterHooks(sched_root_task_t * __restrict root
 
 	root->root_hooks.hook_exec.cancel = sched_hook_cancel;
 	root->root_hooks.hook_exec.fetch = sched_hook_fetch;
+	root->root_hooks.hook_exec.exception = sched_hook_exception;
 
 	root->root_hooks.hook_root.init = sched_hook_init;
 	root->root_hooks.hook_root.fini = sched_hook_fini;
@@ -322,7 +323,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 				break;
 			}
 		} else if (criteria == CRITERIA_FD) {
-			if (TASK_FD(task) == (u_long) param) {
+			if (TASK_FD(task) == (int) param) {
 				flg++;
 				break;
 			}
@@ -362,10 +363,11 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 /*
  * schedRun() - Scheduler *run loop*
  * @root = root task
+ * @killState = kill condition variable, if !=0 stop scheduler loop
  * return: -1 error or 0 ok
  */
 int
-schedRun(sched_root_task_t * __restrict root)
+schedRun(sched_root_task_t * __restrict root, volatile intptr_t * __restrict killState)
 {
 	sched_task_t *task;
 
@@ -375,9 +377,16 @@ schedRun(sched_root_task_t * __restrict root)
 	if (root->root_hooks.hook_exec.run)
 		if (root->root_hooks.hook_exec.run(root, NULL))
 			return -1;
-	if (root->root_hooks.hook_exec.fetch)
-		while ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
-			schedCall(task);
+	if (root->root_hooks.hook_exec.fetch) {
+		if (killState)
+			while (!*killState) {
+				if ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
+					schedCall(task);
+			}
+		else
+			while ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
+				schedCall(task);
+	}
 
 	return 0;
 }