--- libaitsched/src/tasks.c	2011/08/05 15:52:00	1.1.1.1
+++ libaitsched/src/tasks.c	2012/01/08 00:51:17	1.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.1.1.1 2011/08/05 15:52:00 misho Exp $
+* $Id: tasks.c,v 1.4 2012/01/08 00:51:17 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,45 +46,75 @@ SUCH DAMAGE.
 #include "global.h"
 
 
+#pragma GCC visibility push(hidden)
+
+inline sched_task_t *
+_sched_useTask(sched_root_task_t * __restrict root)
+{
+	sched_task_t *task;
+
+	TAILQ_FOREACH(task, &root->root_unuse, task_node) {
+		if (!TASK_ISLOCKED(task)) {
+			TAILQ_REMOVE(&root->root_unuse, task, task_node);
+			break;
+		}
+	}
+
+	if (!task) {
+		task = malloc(sizeof(sched_task_t));
+		if (!task) {
+			LOGERR;
+			return NULL;
+		}
+	}
+
+	return task;
+}
+
+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 = NULL;
+
+	return task;
+}
+
+#pragma GCC visibility pop
+
+
 /*
- * schedRead() - Add READ task to scheduler queue
+ * schedRead() - Add READ I/O task to scheduler queue
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like fd handle
+ * @fd = fd handle
  * 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, ...)
+schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd)
 {
 	sched_task_t *task;
 	void *ptr;
-	va_list lst;
 
 	if (!root || !func)
 		return NULL;
 
 	/* get new task */
-	if ((task = TAILQ_FIRST(&root->root_unuse)))
-		TAILQ_REMOVE(&root->root_unuse, task, task_node);
-	else {
-		task = malloc(sizeof(sched_task_t));
-		if (!task) {
-			LOGERR;
-			return NULL;
-		}
-	}
+	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_ARG(task) = arg;
-	va_start(lst, arg);
-	TASK_FD(task) = va_arg(lst, int);
-	va_end(lst);
+	TASK_FD(task) = fd;
 
 	if (root->root_hooks.hook_add.read)
 		ptr = root->root_hooks.hook_add.read(task, NULL);
@@ -93,54 +123,42 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 
 	if (!ptr)
 		TAILQ_INSERT_TAIL(&root->root_read, task, task_node);
-	else {
-		task->task_type = taskUNUSE;
-		TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node);
-		task = NULL;
-	}
+	else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
 
 /*
- * schedWrite() - Add WRITE task to scheduler queue
+ * schedWrite() - Add WRITE I/O task to scheduler queue
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like fd handle
+ * @fd = fd handle
  * 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, ...)
+schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd)
 {
 	sched_task_t *task;
 	void *ptr;
-	va_list lst;
 
 	if (!root || !func)
 		return NULL;
 
 	/* get new task */
-	if ((task = TAILQ_FIRST(&root->root_unuse)))
-		TAILQ_REMOVE(&root->root_unuse, task, task_node);
-	else {
-		task = malloc(sizeof(sched_task_t));
-		if (!task) {
-			LOGERR;
-			return NULL;
-		}
-	}
+	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_ARG(task) = arg;
-	va_start(lst, arg);
-	TASK_FD(task) = va_arg(lst, int);
-	va_end(lst);
+	TASK_FD(task) = fd;
 
 	if (root->root_hooks.hook_add.write)
 		ptr = root->root_hooks.hook_add.write(task, NULL);
@@ -149,11 +167,8 @@ schedWrite(sched_root_task_t * __restrict root, sched_
 
 	if (!ptr)
 		TAILQ_INSERT_TAIL(&root->root_write, task, task_node);
-	else {
-		task->task_type = taskUNUSE;
-		TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node);
-		task = NULL;
-	}
+	else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -163,48 +178,37 @@ schedWrite(sched_root_task_t * __restrict root, sched_
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments in microSecs, define period 1sec == 1000000
+ * @tv = timeout argument structure
  * 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, ...)
+schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timeval tv)
 {
 	sched_task_t *task, *t = NULL;
 	void *ptr;
-	va_list lst;
 	struct timeval now;
 	struct timespec nw;
-	u_int tim;
 
 	if (!root || !func)
 		return NULL;
 
 	/* get new task */
-	if ((task = TAILQ_FIRST(&root->root_unuse)))
-		TAILQ_REMOVE(&root->root_unuse, task, task_node);
-	else {
-		task = malloc(sizeof(sched_task_t));
-		if (!task) {
-			LOGERR;
-			return NULL;
-		}
-	}
+	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_ARG(task) = arg;
-	va_start(lst, arg);
-	tim = va_arg(lst, u_int);
-	va_end(lst);
 
 	/* calculate timeval structure */
 	clock_gettime(CLOCK_MONOTONIC, &nw);
-	now.tv_sec = nw.tv_sec + tim / 1000000;
-	now.tv_usec = nw.tv_nsec / 1000 + (tim % 1000000);
+	now.tv_sec = nw.tv_sec + tv.tv_sec;
+	now.tv_usec = nw.tv_nsec / 1000 + tv.tv_usec;
 	if (now.tv_usec >= 1000000) {
 		now.tv_sec++;
 		now.tv_usec -= 1000000;
@@ -231,11 +235,8 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 		else
 			TAILQ_INSERT_BEFORE(t, task, task_node);
 #endif
-	} else {
-		task->task_type = taskUNUSE;
-		TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node);
-		task = NULL;
-	}
+	} else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -245,40 +246,31 @@ schedTimer(sched_root_task_t * __restrict root, sched_
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like u_long
+ * @val = additional func argument
  * 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, ...)
+schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val)
 {
 	sched_task_t *task;
 	void *ptr;
-	va_list lst;
 
 	if (!root || !func)
 		return NULL;
 
 	/* get new task */
-	if ((task = TAILQ_FIRST(&root->root_unuse)))
-		TAILQ_REMOVE(&root->root_unuse, task, task_node);
-	else {
-		task = malloc(sizeof(sched_task_t));
-		if (!task) {
-			LOGERR;
-			return NULL;
-		}
-	}
+	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_ARG(task) = arg;
-	va_start(lst, arg);
-	TASK_VAL(task) = va_arg(lst, u_long);
-	va_end(lst);
+	TASK_VAL(task) = val;
 
 	if (root->root_hooks.hook_add.event)
 		ptr = root->root_hooks.hook_add.event(task, NULL);
@@ -287,11 +279,8 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 
 	if (!ptr)
 		TAILQ_INSERT_TAIL(&root->root_event, task, task_node);
-	else {
-		task->task_type = taskUNUSE;
-		TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node);
-		task = NULL;
-	}
+	else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -302,40 +291,31 @@ schedEvent(sched_root_task_t * __restrict root, sched_
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like u_long
+ * @val = additional func argument
  * 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, ...)
+schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val)
 {
 	sched_task_t *task;
 	void *ptr;
-	va_list lst;
 
 	if (!root || !func)
 		return NULL;
 
 	/* get new task */
-	if ((task = TAILQ_FIRST(&root->root_unuse)))
-		TAILQ_REMOVE(&root->root_unuse, task, task_node);
-	else {
-		task = malloc(sizeof(sched_task_t));
-		if (!task) {
-			LOGERR;
-			return NULL;
-		}
-	}
+	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_ARG(task) = arg;
-	va_start(lst, arg);
-	TASK_VAL(task) = va_arg(lst, u_long);
-	va_end(lst);
+	TASK_VAL(task) = val;
 
 	if (root->root_hooks.hook_add.eventlo)
 		ptr = root->root_hooks.hook_add.eventlo(task, NULL);
@@ -344,11 +324,8 @@ schedEventLo(sched_root_task_t * __restrict root, sche
 
 	if (!ptr)
 		TAILQ_INSERT_TAIL(&root->root_eventlo, task, task_node);
-	else {
-		task->task_type = taskUNUSE;
-		TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node);
-		task = NULL;
-	}
+	else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -358,45 +335,34 @@ schedEventLo(sched_root_task_t * __restrict root, sche
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like u_long
- * return: NULL error or !=NULL new queued task
+ * @val = additional func argument
+ * return: return value from called func
  */
 sched_task_t *
-schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, ...)
+schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long val)
 {
 	sched_task_t *task;
-	va_list lst;
+	void *ret;
 
 	if (!root || !func)
 		return NULL;
 
 	/* get new task */
-	if ((task = TAILQ_FIRST(&root->root_unuse)))
-		TAILQ_REMOVE(&root->root_unuse, task, task_node);
-	else {
-		task = malloc(sizeof(sched_task_t));
-		if (!task) {
-			LOGERR;
-			return NULL;
-		}
-	}
+	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_ARG(task) = arg;
-	va_start(lst, arg);
-	TASK_VAL(task) = va_arg(lst, u_long);
-	va_end(lst);
+	TASK_VAL(task) = val;
 
-	if (schedCall(task)) {
-		task->task_type = taskUNUSE;
-		TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node);
-		task = NULL;
-	}
+	ret = schedCall(task);
 
-	return task;
+	_sched_unuseTask(task);
+	return ret;
 }