--- libaitsched/src/tasks.c	2011/12/08 08:02:24	1.3
+++ libaitsched/src/tasks.c	2011/12/08 09:17:34	1.3.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.3 2011/12/08 08:02:24 misho Exp $
+* $Id: tasks.c,v 1.3.2.1 2011/12/08 09:17:34 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,6 +46,45 @@ 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 I/O task to scheduler queue
  * @root = root task
@@ -64,18 +103,12 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 		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;
@@ -90,11 +123,8 @@ 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;
 }
@@ -117,18 +147,12 @@ schedWrite(sched_root_task_t * __restrict root, sched_
 		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;
@@ -143,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;
 }
@@ -172,18 +193,12 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 		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;
@@ -220,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;
 }
@@ -247,18 +259,12 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 		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;
@@ -273,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;
 }
@@ -301,18 +304,12 @@ schedEventLo(sched_root_task_t * __restrict root, sche
 		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;
@@ -327,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;
 }
@@ -354,18 +348,12 @@ schedCallOnce(sched_root_task_t * __restrict root, sch
 		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;
@@ -375,7 +363,6 @@ schedCallOnce(sched_root_task_t * __restrict root, sch
 
 	ret = schedCall(task);
 
-	task->task_type = taskUNUSE;
-	TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node);
+	_sched_unuseTask(task);
 	return ret;
 }