--- libaitsched/inc/aitsched.h	2012/08/01 12:49:26	1.11.2.2
+++ libaitsched/inc/aitsched.h	2012/08/02 12:32:07	1.11.2.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.11.2.2 2012/08/01 12:49:26 misho Exp $
+* $Id: aitsched.h,v 1.11.2.9 2012/08/02 12:32:07 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -49,9 +49,13 @@ SUCH DAMAGE.
 
 #include <sys/types.h>
 #include <sys/queue.h>
+#include <sys/event.h>
 #include <sys/uio.h>
 #include <stdint.h>
 #include <pthread.h>
+#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
+#include <aio.h>
+#endif
 
 
 /* criteria type */
@@ -402,6 +406,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)))
 
+#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT)
 /*
  * schedAIO() - Add AIO task to scheduler queue
  *
@@ -414,9 +419,66 @@ sched_task_t *schedSignal(sched_root_task_t * __restri
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *schedAIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
-		unsigned long 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)))
+		struct aiocb * __restrict acb, void *opt_data, size_t opt_dlen);
+/*
+ * schedAIORead() - Add AIO read task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @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, off_t offset);
+/*
+ * schedAIOWrite() - Add AIO write task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @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, off_t offset);
+#ifdef EVFILT_LIO
+/*
+ * 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 */
+#endif	/* EVFILT_AIO */
 
 /*
  * schedUser() - Add trigger USER task to scheduler queue