--- libaitsched/src/tasks.c	2012/01/08 00:51:17	1.4
+++ libaitsched/src/tasks.c	2012/08/02 11:37:08	1.10.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.4 2012/01/08 00:51:17 misho Exp $
+* $Id: tasks.c,v 1.10.2.7 2012/08/02 11:37:08 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -51,11 +51,17 @@ SUCH DAMAGE.
 inline sched_task_t *
 _sched_useTask(sched_root_task_t * __restrict root)
 {
-	sched_task_t *task;
+	sched_task_t *task, *tmp;
 
-	TAILQ_FOREACH(task, &root->root_unuse, task_node) {
+	TAILQ_FOREACH_SAFE(task, &root->root_unuse, task_node, tmp) {
 		if (!TASK_ISLOCKED(task)) {
+#ifdef HAVE_LIBPTHREAD
+			pthread_mutex_lock(&root->root_mtx[taskUNUSE]);
+#endif
 			TAILQ_REMOVE(&root->root_unuse, task, task_node);
+#ifdef HAVE_LIBPTHREAD
+			pthread_mutex_unlock(&root->root_mtx[taskUNUSE]);
+#endif
 			break;
 		}
 	}
@@ -68,6 +74,8 @@ _sched_useTask(sched_root_task_t * __restrict root)
 		}
 	}
 
+	memset(task, 0, sizeof(sched_task_t));
+	task->task_id = (uintptr_t) task;
 	return task;
 }
 
@@ -75,8 +83,14 @@ inline sched_task_t *
 _sched_unuseTask(sched_task_t * __restrict task)
 {
 	TASK_UNLOCK(task);
-	task->task_type = taskUNUSE;
-	TAILQ_INSERT_TAIL(&task->task_root->root_unuse, task, task_node);
+	TASK_TYPE(task) = taskUNUSE;
+#ifdef HAVE_LIBPTHREAD
+	pthread_mutex_lock(&TASK_ROOT(task)->root_mtx[taskUNUSE]);
+#endif
+	TAILQ_INSERT_TAIL(&TASK_ROOT(task)->root_unuse, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+	pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[taskUNUSE]);
+#endif
 	task = NULL;
 
 	return task;
@@ -87,14 +101,18 @@ _sched_unuseTask(sched_task_t * __restrict task)
 
 /*
  * schedRead() - Add READ I/O task to scheduler queue
+ *
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
  * @fd = fd handle
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd)
+schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ptr;
@@ -106,24 +124,30 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 	if (!(task = _sched_useTask(root)))
 		return NULL;
 
-	memset(task, 0, sizeof(sched_task_t));
-	task->task_id = 0;
-	task->task_lock = 0;
-	task->task_type = taskREAD;
-	task->task_root = root;
 	task->task_func = func;
+	TASK_TYPE(task) = taskREAD;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_FD(task) = fd;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	if (root->root_hooks.hook_add.read)
 		ptr = root->root_hooks.hook_add.read(task, NULL);
 	else
 		ptr = NULL;
 
-	if (!ptr)
-		TAILQ_INSERT_TAIL(&root->root_read, task, task_node);
-	else
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskREAD]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_read, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskREAD]);
+#endif
+	} else
 		task = _sched_unuseTask(task);
 
 	return task;
@@ -131,14 +155,18 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 
 /*
  * schedWrite() - Add WRITE I/O task to scheduler queue
+ *
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
  * @fd = fd handle
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd)
+schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ptr;
@@ -150,44 +178,624 @@ schedWrite(sched_root_task_t * __restrict root, sched_
 	if (!(task = _sched_useTask(root)))
 		return NULL;
 
-	memset(task, 0, sizeof(sched_task_t));
-	task->task_id = 0;
-	task->task_lock = 0;
-	task->task_type = taskWRITE;
-	task->task_root = root;
 	task->task_func = func;
+	TASK_TYPE(task) = taskWRITE;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_FD(task) = fd;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	if (root->root_hooks.hook_add.write)
 		ptr = root->root_hooks.hook_add.write(task, NULL);
 	else
 		ptr = NULL;
 
-	if (!ptr)
-		TAILQ_INSERT_TAIL(&root->root_write, task, task_node);
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskWRITE]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_write, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskWRITE]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
+
+	return task;
+}
+
+/*
+ * schedNode() - Add NODE task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @fd = fd handle
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedNode(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
+		void *opt_data, size_t opt_dlen)
+{
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func)
+		return NULL;
+
+	/* get new task */
+	if (!(task = _sched_useTask(root)))
+		return NULL;
+
+	task->task_func = func;
+	TASK_TYPE(task) = taskNODE;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_FD(task) = fd;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.node)
+		ptr = root->root_hooks.hook_add.node(task, NULL);
 	else
+		ptr = NULL;
+
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskNODE]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_node, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskNODE]);
+#endif
+	} else
 		task = _sched_unuseTask(task);
 
 	return task;
 }
 
 /*
+ * schedProc() - Add PROC task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @pid = PID
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedProc(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long pid, 
+		void *opt_data, size_t opt_dlen)
+{
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func)
+		return NULL;
+
+	/* get new task */
+	if (!(task = _sched_useTask(root)))
+		return NULL;
+
+	task->task_func = func;
+	TASK_TYPE(task) = taskPROC;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_VAL(task) = pid;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.proc)
+		ptr = root->root_hooks.hook_add.proc(task, NULL);
+	else
+		ptr = NULL;
+
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskPROC]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_proc, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskPROC]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
+
+	return task;
+}
+
+/*
+ * schedUser() - Add trigger USER task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @id = Trigger ID
+ * @opt_data = Optional data
+ * @opt_dlen = Optional user's trigger flags
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedUser(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long id, 
+		void *opt_data, size_t opt_dlen)
+{
+#ifndef EVFILT_USER
+	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
+	return NULL;
+#else
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func)
+		return NULL;
+
+	/* get new task */
+	if (!(task = _sched_useTask(root)))
+		return NULL;
+
+	task->task_func = func;
+	TASK_TYPE(task) = taskUSER;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_VAL(task) = id;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.user)
+		ptr = root->root_hooks.hook_add.user(task, NULL);
+	else
+		ptr = NULL;
+
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskUSER]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_user, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskUSER]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
+
+	return task;
+#endif
+}
+
+/*
+ * schedSignal() - Add SIGNAL task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @sig = Signal
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedSignal(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long sig, 
+		void *opt_data, size_t opt_dlen)
+{
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func)
+		return NULL;
+
+	/* get new task */
+	if (!(task = _sched_useTask(root)))
+		return NULL;
+
+	task->task_func = func;
+	TASK_TYPE(task) = taskSIGNAL;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_VAL(task) = sig;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.signal)
+		ptr = root->root_hooks.hook_add.signal(task, NULL);
+	else
+		ptr = NULL;
+
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskSIGNAL]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_signal, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskSIGNAL]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
+
+	return task;
+}
+
+/*
+ * schedAlarm() - Add ALARM task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @ts = timeout argument structure, minimum alarm timer resolution is 1msec!
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedAlarm(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts, 
+		void *opt_data, size_t opt_dlen)
+{
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func)
+		return NULL;
+
+	/* get new task */
+	if (!(task = _sched_useTask(root)))
+		return NULL;
+
+	task->task_func = func;
+	TASK_TYPE(task) = taskALARM;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_TS(task) = ts;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.alarm)
+		ptr = root->root_hooks.hook_add.alarm(task, NULL);
+	else
+		ptr = NULL;
+
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskALARM]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_alarm, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskALARM]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
+
+	return task;
+}
+
+#ifdef EVFILT_AIO
+/*
+ * schedAIO() - Add AIO task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @acb = AIO cb structure address
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
+ * 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, 
+		struct aiocb * __restrict acb, void *opt_data, size_t opt_dlen)
+{
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func || !acb || !opt_dlen)
+		return NULL;
+
+	/* get new task */
+	if (!(task = _sched_useTask(root)))
+		return NULL;
+
+	task->task_func = func;
+	TASK_TYPE(task) = taskAIO;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_VAL(task) = (u_long) acb;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.aio)
+		ptr = root->root_hooks.hook_add.aio(task, NULL);
+	else
+		ptr = NULL;
+
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskAIO]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_aio, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskAIO]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
+
+	return task;
+}
+
+/*
+ * 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)
+{
+	struct aiocb *acb;
+	off_t off = 0;
+
+	if (!root || !func || !buffer || !buflen)
+		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_kqueue = root->root_kq;
+	acb->aio_sigevent.sigev_value.sival_ptr = acb;
+
+	if (aio_read(acb)) {
+		LOGERR;
+		free(acb);
+		return NULL;
+	}
+
+	return schedAIO(root, func, arg, acb, buffer, buflen);
+}
+
+/*
+ * 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)
+{
+	struct aiocb *acb;
+	off_t off = 0;
+
+	if (!root || !func || !buffer || !buflen)
+		return NULL;
+
+	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_kqueue = root->root_kq;
+	acb->aio_sigevent.sigev_value.sival_ptr = acb;
+
+	if (aio_write(acb)) {
+		LOGERR;
+		free(acb);
+		return NULL;
+	}
+
+	return schedAIO(root, func, arg, acb, buffer, buflen);
+}
+
+#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
+ */
+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;
+		return NULL;
+	}
+
+	return schedAIO(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;
+		return NULL;
+	}
+
+	return schedAIO(root, func, arg, (void*) acb, bufs, nbufs);
+}
+#endif	/* EVFILT_LIO */
+#endif	/* EVFILT_AIO */
+
+/*
  * schedTimer() - Add TIMER task to scheduler queue
+ *
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @tv = timeout argument structure
+ * @ts = timeout argument structure
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timeval tv)
+schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts, 
+		void *opt_data, size_t opt_dlen)
 {
-	sched_task_t *task, *t = NULL;
+	sched_task_t *task, *tmp, *t = NULL;
 	void *ptr;
-	struct timeval now;
-	struct timespec nw;
+	struct timespec now;
 
 	if (!root || !func)
 		return NULL;
@@ -196,27 +804,27 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 	if (!(task = _sched_useTask(root)))
 		return NULL;
 
-	memset(task, 0, sizeof(sched_task_t));
-	task->task_id = 0;
-	task->task_lock = 0;
-	task->task_type = taskTIMER;
-	task->task_root = root;
 	task->task_func = func;
+	TASK_TYPE(task) = taskTIMER;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	/* calculate timeval structure */
-	clock_gettime(CLOCK_MONOTONIC, &nw);
-	now.tv_sec = nw.tv_sec + tv.tv_sec;
-	now.tv_usec = nw.tv_nsec / 1000 + tv.tv_usec;
-	if (now.tv_usec >= 1000000) {
+	clock_gettime(CLOCK_MONOTONIC, &now);
+	now.tv_sec += ts.tv_sec;
+	now.tv_nsec += ts.tv_nsec;
+	if (now.tv_nsec >= 1000000000L) {
 		now.tv_sec++;
-		now.tv_usec -= 1000000;
-	} else if (now.tv_usec < 0) {
+		now.tv_nsec -= 1000000000L;
+	} else if (now.tv_nsec < 0) {
 		now.tv_sec--;
-		now.tv_usec += 1000000;
+		now.tv_nsec += 1000000000L;
 	}
-	TASK_TV(task) = now;
+	TASK_TS(task) = now;
 
 	if (root->root_hooks.hook_add.timer)
 		ptr = root->root_hooks.hook_add.timer(task, NULL);
@@ -224,17 +832,23 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 		ptr = NULL;
 
 	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskTIMER]);
+#endif
 #ifdef TIMER_WITHOUT_SORT
-		TAILQ_INSERT_TAIL(&root->root_timer, task, task_node);
+		TAILQ_INSERT_TAIL(&root->root_timer, TASK_ID(task), task_node);
 #else
-		TAILQ_FOREACH(t, &root->root_timer, task_node)
-			if (timercmp(&TASK_TV(task), &TASK_TV(t), -) < 1)
+		TAILQ_FOREACH_SAFE(t, &root->root_timer, task_node, tmp)
+			if (sched_timespeccmp(&TASK_TS(task), &TASK_TS(t), -) < 1)
 				break;
 		if (!t)
-			TAILQ_INSERT_TAIL(&root->root_timer, task, task_node);
+			TAILQ_INSERT_TAIL(&root->root_timer, TASK_ID(task), task_node);
 		else
-			TAILQ_INSERT_BEFORE(t, task, task_node);
+			TAILQ_INSERT_BEFORE(t, TASK_ID(task), task_node);
 #endif
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskTIMER]);
+#endif
 	} else
 		task = _sched_unuseTask(task);
 
@@ -243,14 +857,18 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 
 /*
  * schedEvent() - Add EVENT task to scheduler queue
+ *
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
  * @val = additional func argument
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val)
+schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ptr;
@@ -262,24 +880,30 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 	if (!(task = _sched_useTask(root)))
 		return NULL;
 
-	memset(task, 0, sizeof(sched_task_t));
-	task->task_id = 0;
-	task->task_lock = 0;
-	task->task_type = taskEVENT;
-	task->task_root = root;
 	task->task_func = func;
+	TASK_TYPE(task) = taskEVENT;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
 
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
 	if (root->root_hooks.hook_add.event)
 		ptr = root->root_hooks.hook_add.event(task, NULL);
 	else
 		ptr = NULL;
 
-	if (!ptr)
-		TAILQ_INSERT_TAIL(&root->root_event, task, task_node);
-	else
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskEVENT]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_event, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskEVENT]);
+#endif
+	} else
 		task = _sched_unuseTask(task);
 
 	return task;
@@ -288,14 +912,18 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 
 /*
  * schedEventLo() - Add EVENT_Lo task to scheduler queue
+ *
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
  * @val = additional func argument
+ * @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)
+schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ptr;
@@ -307,24 +935,84 @@ schedEventLo(sched_root_task_t * __restrict root, sche
 	if (!(task = _sched_useTask(root)))
 		return NULL;
 
-	memset(task, 0, sizeof(sched_task_t));
-	task->task_id = 0;
-	task->task_lock = 0;
-	task->task_type = taskEVENT;
-	task->task_root = root;
 	task->task_func = func;
+	TASK_TYPE(task) = taskEVENT;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
 
+	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);
 	else
 		ptr = NULL;
 
-	if (!ptr)
-		TAILQ_INSERT_TAIL(&root->root_eventlo, task, task_node);
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskEVENTLO]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_eventlo, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskEVENTLO]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
+
+	return task;
+}
+
+/*
+ * schedSuspend() - Add Suspended task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @id = Trigger ID
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedSuspend(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long id, 
+		void *opt_data, size_t opt_dlen)
+{
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func)
+		return NULL;
+
+	/* get new task */
+	if (!(task = _sched_useTask(root)))
+		return NULL;
+
+	task->task_func = func;
+	TASK_TYPE(task) = taskSUSPEND;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_VAL(task) = id;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.suspend)
+		ptr = root->root_hooks.hook_add.suspend(task, NULL);
 	else
+		ptr = NULL;
+
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskSUSPEND]);
+#endif
+		TAILQ_INSERT_TAIL(&root->root_suspend, TASK_ID(task), task_node);
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]);
+#endif
+	} else
 		task = _sched_unuseTask(task);
 
 	return task;
@@ -332,14 +1020,18 @@ schedEventLo(sched_root_task_t * __restrict root, sche
 
 /*
  * schedCallOnce() - Call once from scheduler
+ *
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
  * @val = additional func argument
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
  * return: return value from called func
  */
 sched_task_t *
-schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val)
+schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task;
 	void *ret;
@@ -351,15 +1043,15 @@ schedCallOnce(sched_root_task_t * __restrict root, sch
 	if (!(task = _sched_useTask(root)))
 		return NULL;
 
-	memset(task, 0, sizeof(sched_task_t));
-	task->task_id = 0;
-	task->task_lock = 0;
-	task->task_type = taskEVENT;
-	task->task_root = root;
 	task->task_func = func;
+	TASK_TYPE(task) = taskEVENT;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
 
 	ret = schedCall(task);