--- libaitsched/inc/aitsched.h	2012/08/01 13:43:14	1.11.2.3
+++ libaitsched/inc/aitsched.h	2012/08/02 13:45:02	1.11.2.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.11.2.3 2012/08/01 13:43:14 misho Exp $
+* $Id: aitsched.h,v 1.11.2.11 2012/08/02 13:45:02 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,10 +49,11 @@ SUCH DAMAGE.
 
 #include <sys/types.h>
 #include <sys/queue.h>
+#include <sys/event.h>
 #include <sys/uio.h>
 #include <stdint.h>
 #include <pthread.h>
-#ifdef EVFILT_AIO
+#ifdef EVFILT_LIO
 #include <aio.h>
 #endif
 
@@ -81,6 +82,7 @@ typedef enum {
 	taskPROC,
 	taskSIGNAL,
 	taskAIO,
+	taskLIO,
 	taskUSER,
 	taskEVENT,
 	taskEVENTLO,
@@ -110,6 +112,8 @@ struct sched_HooksTask {
 		sched_hook_func_t	signal;
 		/* aio(sched_task_t *task, NULL) -> int */
 		sched_hook_func_t	aio;
+		/* lio(sched_task_t *task, NULL) -> int */
+		sched_hook_func_t	lio;
 		/* user(sched_task_t *task, NULL) -> int */
 		sched_hook_func_t	user;
 		/* event(sched_task_t *task, NULL) -> int */
@@ -208,6 +212,7 @@ struct sched_RootTask {
 	sched_queue_t	root_proc;
 	sched_queue_t	root_signal;
 	sched_queue_t	root_aio;
+	sched_queue_t	root_lio;
 	sched_queue_t	root_user;
 	sched_queue_t	root_event;
 	sched_queue_t	root_eventlo;
@@ -405,6 +410,7 @@ sched_task_t *schedSignal(sched_root_task_t * __restri
 #define schedSignalSelf(x)	schedSignal(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
 		TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x)))
 
+#ifdef EVFILT_LIO
 /*
  * schedAIO() - Add AIO task to scheduler queue
  *
@@ -418,8 +424,6 @@ sched_task_t *schedSignal(sched_root_task_t * __restri
  */
 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);
-#define schedAIOSelf(x)	schedAIO(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
-		TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x)))
 /*
  * schedAIORead() - Add AIO read task to scheduler queue
  *
@@ -429,10 +433,11 @@ sched_task_t *schedAIO(sched_root_task_t * __restrict 
  * @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 *arg, int fd, void *buffer, size_t buflen, off_t offset);
 /*
  * schedAIOWrite() - Add AIO write task to scheduler queue
  *
@@ -442,10 +447,54 @@ inline sched_task_t *schedAIORead(sched_root_task_t * 
  * @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 *arg, int fd, void *buffer, size_t buflen, off_t offset);
+
+/*
+ * 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);
+/*
+ * 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
+ */
+inline 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);
+/*
+ * 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);
+#endif	/* EVFILT_LIO */
 
 /*
  * schedUser() - Add trigger USER task to scheduler queue