--- libaitsched/src/tasks.c	2012/08/01 13:43:14	1.10.2.2
+++ 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.2 2012/08/01 13:43:14 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,6 +482,7 @@ schedAlarm(sched_root_task_t * __restrict root, sched_
 	return task;
 }
 
+#ifdef AIO_SUPPORT
 /*
  * schedAIO() - Add AIO task to scheduler queue
  *
@@ -497,14 +498,10 @@ sched_task_t *
 schedAIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		struct aiocb * __restrict acb, void *opt_data, size_t opt_dlen)
 {
-#ifndef EVFILT_AIO
-	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
-	return NULL;
-#else
 	sched_task_t *task;
 	void *ptr;
 
-	if (!root || !func)
+	if (!root || !func || !acb || !opt_dlen)
 		return NULL;
 
 	/* get new task */
@@ -538,7 +535,6 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta
 		task = _sched_unuseTask(task);
 
 	return task;
-#endif
 }
 
 /*
@@ -550,24 +546,28 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta
  * @fd = file descriptor
  * @buffer = Buffer
  * @buflen = Buffer length
+ * @offset = Offset from start of file, if =-1 from current position
  * return: NULL error or !=NULL new queued task
  */
 inline sched_task_t *
 schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
-		void *buffer, size_t buflen)
+		void *buffer, size_t buflen, off_t offset)
 {
-#ifndef EVFILT_AIO
-	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
-	return NULL;
-#else
 	struct aiocb *acb;
-	off_t off = 0;
+	off_t off;
 
-	if (!root || !func)
+	if (!root || !func || !buffer || !buflen)
 		return NULL;
-	else
-		memset(buffer, 0, buflen);
 
+	if (offset == (off_t) -1) {
+		off = lseek(fd, 0, SEEK_CUR);
+		if (off == -1) {
+			LOGERR;
+			return NULL;
+		}
+	} else
+		off = offset;
+
 	if (!(acb = malloc(sizeof(struct aiocb)))) {
 		LOGERR;
 		return NULL;
@@ -577,17 +577,10 @@ schedAIORead(sched_root_task_t * __restrict root, sche
 	acb->aio_fildes = fd;
 	acb->aio_nbytes = buflen;
 	acb->aio_buf = buffer;
-	off = lseek(fd, 0, SEEK_CUR);
-	if (off == -1) {
-		LOGERR;
-		free(acb);
-		return NULL;
-	} else
-		acb->aio_offset = off;
+	acb->aio_offset = off;
 	acb->aio_sigevent.sigev_notify = SIGEV_KEVENT;
-	acb->aio_sigevent.sigev_notify_kevent_flags = EV_CLEAR | EV_ONESHOT;
 	acb->aio_sigevent.sigev_notify_kqueue = root->root_kq;
-	acb->aio_sigevent.sigev_value.sival_ptr = (void*) O_RDONLY;
+	acb->aio_sigevent.sigev_value.sival_ptr = acb;
 
 	if (aio_read(acb)) {
 		LOGERR;
@@ -596,7 +589,6 @@ schedAIORead(sched_root_task_t * __restrict root, sche
 	}
 
 	return schedAIO(root, func, arg, acb, buffer, buflen);
-#endif
 }
 
 /*
@@ -608,24 +600,28 @@ schedAIORead(sched_root_task_t * __restrict root, sche
  * @fd = file descriptor
  * @buffer = Buffer
  * @buflen = Buffer length
+ * @offset = Offset from start of file, if =-1 from current position
  * return: NULL error or !=NULL new queued task
  */
 inline sched_task_t *
 schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
-		void *buffer, size_t buflen)
+		void *buffer, size_t buflen, off_t offset)
 {
-#ifndef EVFILT_AIO
-	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
-	return NULL;
-#else
 	struct aiocb *acb;
-	off_t off = 0;
+	off_t off;
 
-	if (!root || !func)
+	if (!root || !func || !buffer || !buflen)
 		return NULL;
-	else
-		memset(buffer, 0, buflen);
 
+	if (offset == (off_t) -1) {
+		off = lseek(fd, 0, SEEK_CUR);
+		if (off == -1) {
+			LOGERR;
+			return NULL;
+		}
+	} else
+		off = offset;
+
 	if (!(acb = malloc(sizeof(struct aiocb)))) {
 		LOGERR;
 		return NULL;
@@ -635,17 +631,10 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch
 	acb->aio_fildes = fd;
 	acb->aio_nbytes = buflen;
 	acb->aio_buf = buffer;
-	off = lseek(fd, 0, SEEK_CUR);
-	if (off == -1) {
-		LOGERR;
-		free(acb);
-		return NULL;
-	} else
-		acb->aio_offset = off;
+	acb->aio_offset = off;
 	acb->aio_sigevent.sigev_notify = SIGEV_KEVENT;
-	acb->aio_sigevent.sigev_notify_kevent_flags = EV_CLEAR | EV_ONESHOT;
 	acb->aio_sigevent.sigev_notify_kqueue = root->root_kq;
-	acb->aio_sigevent.sigev_value.sival_ptr = (void*) O_WRONLY;
+	acb->aio_sigevent.sigev_value.sival_ptr = acb;
 
 	if (aio_write(acb)) {
 		LOGERR;
@@ -654,10 +643,210 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch
 	}
 
 	return schedAIO(root, func, arg, acb, buffer, buflen);
+}
+
+#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
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @fd = file descriptor
+ * @bufs = Buffer's list
+ * @nbufs = Number of Buffers
+ * @offset = Offset from start of file, if =-1 from current position
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedLIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
+		struct iovec *bufs, size_t nbufs, off_t offset)
+{
+	struct sigevent sig;
+	struct aiocb **acb;
+	off_t off;
+	register int i;
+
+	if (!root || !func || !bufs || !nbufs)
+		return NULL;
+
+	if (offset == (off_t) -1) {
+		off = lseek(fd, 0, SEEK_CUR);
+		if (off == -1) {
+			LOGERR;
+			return NULL;
+		}
+	} else
+		off = offset;
+
+	if (!(acb = calloc(sizeof(void*), nbufs))) {
+		LOGERR;
+		return NULL;
+	} else
+		memset(acb, 0, sizeof(void*) * nbufs);
+	for (i = 0; i < nbufs; off += bufs[i++].iov_len) {
+		acb[i] = malloc(sizeof(struct aiocb));
+		if (!acb[i]) {
+			LOGERR;
+			for (i = 0; i < nbufs; i++)
+				if (acb[i])
+					free(acb[i]);
+			free(acb);
+			return NULL;
+		} else
+			memset(acb[i], 0, sizeof(struct aiocb));
+		acb[i]->aio_fildes = fd;
+		acb[i]->aio_nbytes = bufs[i].iov_len;
+		acb[i]->aio_buf = bufs[i].iov_base;
+		acb[i]->aio_offset = off;
+		acb[i]->aio_lio_opcode = LIO_READ;
+	}
+	memset(&sig, 0, sizeof sig);
+	sig.sigev_notify = SIGEV_KEVENT;
+	sig.sigev_notify_kqueue = root->root_kq;
+	sig.sigev_value.sival_ptr = acb;
+
+	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 schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
+}
+
+/*
+ * schedLIOWrite() - Add list of AIO write tasks to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @fd = file descriptor
+ * @bufs = Buffer's list
+ * @nbufs = Number of Buffers
+ * @offset = Offset from start of file, if =-1 from current position
+ * return: NULL error or !=NULL new queued task
+ */
+inline sched_task_t *
+schedLIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
+		struct iovec *bufs, size_t nbufs, off_t offset)
+{
+	struct sigevent sig;
+	struct aiocb **acb;
+	off_t off;
+	register int i;
+
+	if (!root || !func || !bufs || !nbufs)
+		return NULL;
+
+	if (offset == (off_t) -1) {
+		off = lseek(fd, 0, SEEK_CUR);
+		if (off == -1) {
+			LOGERR;
+			return NULL;
+		}
+	} else
+		off = offset;
+
+	if (!(acb = calloc(sizeof(void*), nbufs))) {
+		LOGERR;
+		return NULL;
+	} else
+		memset(acb, 0, sizeof(void*) * nbufs);
+	for (i = 0; i < nbufs; off += bufs[i++].iov_len) {
+		acb[i] = malloc(sizeof(struct aiocb));
+		if (!acb[i]) {
+			LOGERR;
+			for (i = 0; i < nbufs; i++)
+				if (acb[i])
+					free(acb[i]);
+			free(acb);
+			return NULL;
+		} else
+			memset(acb[i], 0, sizeof(struct aiocb));
+		acb[i]->aio_fildes = fd;
+		acb[i]->aio_nbytes = bufs[i].iov_len;
+		acb[i]->aio_buf = bufs[i].iov_base;
+		acb[i]->aio_offset = off;
+		acb[i]->aio_lio_opcode = LIO_WRITE;
+	}
+	memset(&sig, 0, sizeof sig);
+	sig.sigev_notify = SIGEV_KEVENT;
+	sig.sigev_notify_kqueue = root->root_kq;
+	sig.sigev_value.sival_ptr = acb;
+
+	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 schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
+}
+#endif	/* EVFILT_LIO */
+#endif	/* AIO_SUPPORT */
+
+/*
  * schedTimer() - Add TIMER task to scheduler queue
  *
  * @root = root task
@@ -790,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)
@@ -815,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);