--- libaitsched/src/aitsched.c	2012/07/24 14:06:11	1.11
+++ libaitsched/src/aitsched.c	2012/08/02 13:45:02	1.11.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.11 2012/07/24 14:06:11 misho Exp $
+* $Id: aitsched.c,v 1.11.2.3 2012/08/02 13:45:02 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -163,8 +163,10 @@ schedInit(void ** __restrict data, size_t datlen)
 		TAILQ_INIT(&root->root_alarm);
 		TAILQ_INIT(&root->root_node);
 		TAILQ_INIT(&root->root_proc);
-		TAILQ_INIT(&root->root_user);
 		TAILQ_INIT(&root->root_signal);
+		TAILQ_INIT(&root->root_aio);
+		TAILQ_INIT(&root->root_lio);
+		TAILQ_INIT(&root->root_user);
 		TAILQ_INIT(&root->root_event);
 		TAILQ_INIT(&root->root_eventlo);
 		TAILQ_INIT(&root->root_suspend);
@@ -223,10 +225,14 @@ schedEnd(sched_root_task_t ** __restrict root)
 		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_proc, task_node, tmp)
 		schedCancel(task);
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp)
-		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_signal, task_node, tmp)
 		schedCancel(task);
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_aio, task_node, tmp)
+		schedCancel(task);
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_lio, task_node, tmp)
+		schedCancel(task);
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp)
+		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp)
 		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, task_node, tmp)
@@ -375,12 +381,18 @@ schedCancel(sched_task_t * __restrict task)
 		case taskPROC:
 			queue = &TASK_ROOT(task)->root_proc;
 			break;
-		case taskUSER:
-			queue = &TASK_ROOT(task)->root_user;
-			break;
 		case taskSIGNAL:
 			queue = &TASK_ROOT(task)->root_signal;
 			break;
+		case taskAIO:
+			queue = &TASK_ROOT(task)->root_aio;
+			break;
+		case taskLIO:
+			queue = &TASK_ROOT(task)->root_lio;
+			break;
+		case taskUSER:
+			queue = &TASK_ROOT(task)->root_user;
+			break;
 		case taskEVENT:
 			queue = &TASK_ROOT(task)->root_event;
 			break;
@@ -446,10 +458,14 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 			return -2;
 		if (schedCancelby(root, taskPROC, criteria, param, hook))
 			return -2;
-		if (schedCancelby(root, taskUSER, criteria, param, hook))
-			return -2;
 		if (schedCancelby(root, taskSIGNAL, criteria, param, hook))
 			return -2;
+		if (schedCancelby(root, taskAIO, criteria, param, hook))
+			return -2;
+		if (schedCancelby(root, taskLIO, criteria, param, hook))
+			return -2;
+		if (schedCancelby(root, taskUSER, criteria, param, hook))
+			return -2;
 		if (schedCancelby(root, taskEVENT, criteria, param, hook))
 			return -2;
 		if (schedCancelby(root, taskEVENTLO, criteria, param, hook))
@@ -480,12 +496,18 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 		case taskPROC:
 			queue = &root->root_proc;
 			break;
-		case taskUSER:
-			queue = &root->root_user;
-			break;
 		case taskSIGNAL:
 			queue = &root->root_signal;
 			break;
+		case taskAIO:
+			queue = &root->root_aio;
+			break;
+		case taskLIO:
+			queue = &root->root_lio;
+			break;
+		case taskUSER:
+			queue = &root->root_user;
+			break;
 		case taskEVENT:
 			queue = &root->root_event;
 			break;
@@ -595,19 +617,19 @@ schedRun(sched_root_task_t *root, volatile intptr_t * 
 					root->root_hooks.hook_exec.condition && 
 					root->root_hooks.hook_exec.condition(root, (void*) killState)) {
 				if ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
-					schedCall(task);
+					root->root_ret = schedCall(task);
 			}
 		else
 			/* trigger scheduler loop */
 			while (!*killState && root && root->root_hooks.hook_exec.fetch) {
 				if ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
-					schedCall(task);
+					root->root_ret = schedCall(task);
 			}
 	} else
 		/* infinite scheduler loop */
 		while (root && root->root_hooks.hook_exec.fetch)
 			if ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
-				schedCall(task);
+				root->root_ret = schedCall(task);
 
 	return 0;
 }