--- libaitsched/src/hooks.c	2012/08/01 16:47:06	1.10.2.6
+++ libaitsched/src/hooks.c	2012/08/02 12:32:07	1.10.2.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.10.2.6 2012/08/01 16:47:06 misho Exp $
+* $Id: hooks.c,v 1.10.2.9 2012/08/02 12:32:07 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -107,7 +107,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 	sched_task_t *t = task;
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
-#ifdef EVFILT_AIO
+#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
 	struct aiocb *acb;
 #endif
 
@@ -159,7 +159,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
 			break;
-#ifdef EVFILT_AIO
+#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
 		case taskAIO:
 #ifdef __NetBSD__
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
@@ -454,10 +454,17 @@ sched_hook_fetch(void *root, void *arg __unused)
 	struct kevent evt[1], res[KQ_EVENTS];
 	register int i, flg;
 	int en;
-#ifdef EVFILT_AIO
+#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
 	int len, fd;
 	struct aiocb *acb;
-#endif
+#ifdef EVFILT_LIO
+	int l;
+	register int j;
+	off_t off;
+	struct aiocb **acbs;
+	struct iovec *iv;
+#endif	/* EVFILT_LIO */
+#endif	/* EVFILT_AIO */
 
 	if (!r)
 		return NULL;
@@ -775,8 +782,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				if (flg > 1)
 					evt->flags ^= evt->flags;
 				break;
-#ifdef EVFILT_AIO
+#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
 			case EVFILT_AIO:
+#ifdef EVFILT_LIO
+			case EVFILT_LIO:
+#endif	/* EVFILT_LIO */
 				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) {
 					acb = (struct aiocb*) TASK_VAL(task);
@@ -800,16 +810,36 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
-					fd = acb->aio_fildes;
-					if ((len = aio_return(acb)) != -1) {
-						if (lseek(fd, acb->aio_offset + len, SEEK_CUR) == -1)
+#ifdef EVFILT_LIO
+					if (res[i].filter == EVFILT_LIO) {
+						acbs = (struct aiocb**) TASK_VAL(task);
+						iv = (struct iovec*) TASK_DATA(task);
+						fd = acbs[0]->aio_fildes;
+						off = acbs[0]->aio_offset;
+						for (j = len = 0; i < TASK_DATLEN(task); len += l, i++) {
+							if ((iv[i].iov_len = aio_return(acbs[i])) == -1)
+								l = 0;
+							else
+								l = iv[i].iov_len;
+							free(acbs[i]);
+						}
+						free(acbs);
+						if (lseek(fd, off + len, SEEK_CUR) == -1)
 							LOGERR;
 					} else
-						LOGERR;
+#endif	/* EVFILT_LIO */
+					{
+						fd = acb->aio_fildes;
+						if ((len = aio_return(acb)) != -1) {
+							if (lseek(fd, acb->aio_offset + len, SEEK_CUR) == -1)
+								LOGERR;
+						} else
+							LOGERR;
 
-					free(acb);
-					TASK_FD(task) = fd;
+						free(acb);
+					}
 					TASK_DATLEN(task) = (u_long) len;
+					TASK_FD(task) = fd;
 				}
 				/* if match at least 2, don't remove resouce of event */
 				if (flg > 1)