--- libaitsched/src/tasks.c	2012/08/02 12:19:29	1.10.2.8
+++ libaitsched/src/tasks.c	2012/08/08 08:15:24	1.11.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.10.2.8 2012/08/02 12:19:29 misho Exp $
+* $Id: tasks.c,v 1.11.2.1 2012/08/08 08:15:24 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -482,7 +482,7 @@ schedAlarm(sched_root_task_t * __restrict root, sched_
 	return task;
 }
 
-#ifdef EVFILT_AIO
+#ifdef AIO_SUPPORT
 /*
  * schedAIO() - Add AIO task to scheduler queue
  *
@@ -647,6 +647,60 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch
 
 #ifdef EVFILT_LIO
 /*
+ * schedLIO() - Add AIO bulk tasks to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @acbs = AIO cb structure addresses
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedLIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
+		struct aiocb ** __restrict acbs, void *opt_data, size_t opt_dlen)
+{
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func || !acbs || !opt_dlen)
+		return NULL;
+
+	/* get new task */
+	if (!(task = _sched_useTask(root)))
+		return NULL;
+
+	task->task_func = func;
+	TASK_TYPE(task) = taskLIO;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_VAL(task) = (u_long) acbs;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.lio)
+		ptr = root->root_hooks.hook_add.lio(task, NULL);
+	else
+		ptr = NULL;
+
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskLIO]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_lio, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskLIO]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
+
+	return task;
+}
+
+/*
  * schedLIORead() - Add list of AIO read tasks to scheduler queue
  *
  * @root = root task
@@ -691,7 +745,7 @@ schedLIORead(sched_root_task_t * __restrict root, sche
 			for (i = 0; i < nbufs; i++)
 				if (acb[i])
 					free(acb[i]);
-				free(acb);
+			free(acb);
 			return NULL;
 		} else
 			memset(acb[i], 0, sizeof(struct aiocb));
@@ -708,10 +762,14 @@ schedLIORead(sched_root_task_t * __restrict root, sche
 
 	if (lio_listio(LIO_NOWAIT, acb, nbufs, &sig)) {
 		LOGERR;
+		for (i = 0; i < nbufs; i++)
+			if (acb[i])
+				free(acb[i]);
+		free(acb);
 		return NULL;
 	}
 
-	return schedAIO(root, func, arg, (void*) acb, bufs, nbufs);
+	return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
 }
 
 /*
@@ -759,7 +817,7 @@ schedLIOWrite(sched_root_task_t * __restrict root, sch
 			for (i = 0; i < nbufs; i++)
 				if (acb[i])
 					free(acb[i]);
-				free(acb);
+			free(acb);
 			return NULL;
 		} else
 			memset(acb[i], 0, sizeof(struct aiocb));
@@ -776,13 +834,17 @@ schedLIOWrite(sched_root_task_t * __restrict root, sch
 
 	if (lio_listio(LIO_NOWAIT, acb, nbufs, &sig)) {
 		LOGERR;
+		for (i = 0; i < nbufs; i++)
+			if (acb[i])
+				free(acb[i]);
+		free(acb);
 		return NULL;
 	}
 
-	return schedAIO(root, func, arg, (void*) acb, bufs, nbufs);
+	return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
 }
 #endif	/* EVFILT_LIO */
-#endif	/* EVFILT_AIO */
+#endif	/* AIO_SUPPORT */
 
 /*
  * schedTimer() - Add TIMER task to scheduler queue
@@ -917,21 +979,21 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 
 
 /*
- * schedEventLo() - Add EVENT_Lo task to scheduler queue
+ * schedTask() - Add regular task to scheduler queue
  *
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @val = additional func argument
+ * @prio = regular task priority, 0 is hi priority for regular tasks
  * @opt_data = Optional data
  * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, 
+schedTask(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long prio, 
 		void *opt_data, size_t opt_dlen)
 {
-	sched_task_t *task;
+	sched_task_t *task, *tmp, *t = NULL;
 	void *ptr;
 
 	if (!root || !func)
@@ -942,27 +1004,33 @@ schedEventLo(sched_root_task_t * __restrict root, sche
 		return NULL;
 
 	task->task_func = func;
-	TASK_TYPE(task) = taskEVENT;
+	TASK_TYPE(task) = taskTASK;
 	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
-	TASK_VAL(task) = val;
+	TASK_VAL(task) = prio;
 
 	TASK_DATA(task) = opt_data;
 	TASK_DATLEN(task) = opt_dlen;
 
-	if (root->root_hooks.hook_add.eventlo)
-		ptr = root->root_hooks.hook_add.eventlo(task, NULL);
+	if (root->root_hooks.hook_add.task)
+		ptr = root->root_hooks.hook_add.task(task, NULL);
 	else
 		ptr = NULL;
 
 	if (!ptr) {
 #ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskEVENTLO]);
+		pthread_mutex_lock(&root->root_mtx[taskTASK]);
 #endif
-		TAILQ_INSERT_TAIL(&root->root_eventlo, TASK_ID(task), task_node);
+		TAILQ_FOREACH_SAFE(t, &root->root_task, task_node, tmp)
+			if (TASK_VAL(task) < TASK_VAL(t))
+				break;
+		if (!t)
+			TAILQ_INSERT_TAIL(&root->root_task, TASK_ID(task), task_node);
+		else
+			TAILQ_INSERT_BEFORE(t, TASK_ID(task), task_node);
 #ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskEVENTLO]);
+		pthread_mutex_unlock(&root->root_mtx[taskTASK]);
 #endif
 	} else
 		task = _sched_unuseTask(task);