--- libaitsched/src/tasks.c	2012/08/01 12:49:26	1.10.2.1
+++ libaitsched/src/tasks.c	2012/08/01 13:43:14	1.10.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.10.2.1 2012/08/01 12:49:26 misho Exp $
+* $Id: tasks.c,v 1.10.2.2 2012/08/01 13:43:14 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -494,8 +494,8 @@ schedAlarm(sched_root_task_t * __restrict root, sched_
  * 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, u_long acb, 
-		void *opt_data, size_t opt_dlen)
+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");
@@ -516,7 +516,7 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta
 	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
-	TASK_VAL(task) = acb;
+	TASK_VAL(task) = (u_long) acb;
 
 	TASK_DATA(task) = opt_data;
 	TASK_DATLEN(task) = opt_dlen;
@@ -538,6 +538,122 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta
 		task = _sched_unuseTask(task);
 
 	return task;
+#endif
+}
+
+/*
+ * 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
+ * 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)
+{
+#ifndef EVFILT_AIO
+	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
+	return NULL;
+#else
+	struct aiocb *acb;
+	off_t off = 0;
+
+	if (!root || !func)
+		return NULL;
+	else
+		memset(buffer, 0, buflen);
+
+	if (!(acb = malloc(sizeof(struct aiocb)))) {
+		LOGERR;
+		return NULL;
+	} else
+		memset(acb, 0, sizeof(struct aiocb));
+
+	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_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;
+
+	if (aio_read(acb)) {
+		LOGERR;
+		free(acb);
+		return NULL;
+	}
+
+	return schedAIO(root, func, arg, acb, buffer, buflen);
+#endif
+}
+
+/*
+ * 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
+ * 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)
+{
+#ifndef EVFILT_AIO
+	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
+	return NULL;
+#else
+	struct aiocb *acb;
+	off_t off = 0;
+
+	if (!root || !func)
+		return NULL;
+	else
+		memset(buffer, 0, buflen);
+
+	if (!(acb = malloc(sizeof(struct aiocb)))) {
+		LOGERR;
+		return NULL;
+	} else
+		memset(acb, 0, sizeof(struct aiocb));
+
+	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_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;
+
+	if (aio_write(acb)) {
+		LOGERR;
+		free(acb);
+		return NULL;
+	}
+
+	return schedAIO(root, func, arg, acb, buffer, buflen);
 #endif
 }