--- libaitsched/src/aitsched.c	2012/07/30 00:20:27	1.11.2.1
+++ libaitsched/src/aitsched.c	2012/08/08 08:25:39	1.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.11.2.1 2012/07/30 00:20:27 misho Exp $
+* $Id: aitsched.c,v 1.13 2012/08/08 08:25:39 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -140,6 +140,9 @@ schedInit(void ** __restrict data, size_t datlen)
 	} else {
 		memset(root, 0, sizeof(sched_root_task_t));
 
+		/* set default maximum regular task hit misses */
+		root->root_miss = MAX_TASK_MISS;
+
 		/* INFINIT polling period by default */
 		sched_timespecinf(&root->root_poll);
 
@@ -163,10 +166,12 @@ 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_task);
 		TAILQ_INIT(&root->root_suspend);
 		TAILQ_INIT(&root->root_ready);
 		TAILQ_INIT(&root->root_unuse);
@@ -223,13 +228,17 @@ 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)
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp)
 		schedCancel(task);
 	TAILQ_FOREACH_SAFE(task, &(*root)->root_suspend, task_node, tmp)
 		schedCancel(task);
@@ -375,17 +384,23 @@ 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;
-		case taskEVENTLO:
-			queue = &TASK_ROOT(task)->root_eventlo;
+		case taskTASK:
+			queue = &TASK_ROOT(task)->root_task;
 			break;
 		case taskSUSPEND:
 			queue = &TASK_ROOT(task)->root_suspend;
@@ -446,13 +461,17 @@ 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))
+		if (schedCancelby(root, taskTASK, criteria, param, hook))
 			return -2;
 		if (schedCancelby(root, taskSUSPEND, criteria, param, hook))
 			return -2;
@@ -480,17 +499,23 @@ 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;
-		case taskEVENTLO:
-			queue = &root->root_eventlo;
+		case taskTASK:
+			queue = &root->root_task;
 			break;
 		case taskSUSPEND:
 			queue = &root->root_suspend;
@@ -643,7 +668,7 @@ schedPolling(sched_root_task_t * __restrict root, stru
  *
  * @root = root task
  * @condValue = condition value, kill schedRun() if condValue == killState
- * return: -1 error ok 0 ok
+ * return: -1 error or 0 ok
  */
 inline int
 schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue)
@@ -653,6 +678,23 @@ schedTermCondition(sched_root_task_t * __restrict root
 
 	root->root_cond = condValue;
 	root->root_hooks.hook_exec.condition = sched_hook_condition;
+	return 0;
+}
+
+/*
+ * schedMissEvents() - Set new miss events rate for regular tasks
+ *
+ * @root = root task
+ * @missEvents = maximum number of missed events before firing tasks
+ * return: -1 error or 0 ok
+ */
+inline int
+schedMissEvents(sched_root_task_t * __restrict root, u_int missEvents)
+{
+	if (!root)
+		return -1;
+
+	root->root_miss = missEvents;
 	return 0;
 }