--- libaitsched/src/tasks.c	2011/12/08 08:02:24	1.3
+++ libaitsched/src/tasks.c	2012/01/08 03:50:11	1.4.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.4.2.1 2012/01/08 03:50:11 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -46,6 +46,57 @@ 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)) {
+#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;
+		}
+	}
+
+	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_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, task_node);
+#ifdef HAVE_LIBPTHREAD
+	pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[taskUNUSE]);
+#endif
+	task = NULL;
+
+	return task;
+}
+
+#pragma GCC visibility pop
+
+
 /*
  * schedRead() - Add READ I/O task to scheduler queue
  * @root = root task
@@ -64,21 +115,15 @@ 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_type = taskREAD;
-	task->task_root = root;
+	task->task_lock = 0;
 	task->task_func = func;
+	TASK_TYPE(task) = taskREAD;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_FD(task) = fd;
@@ -88,13 +133,16 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 	else
 		ptr = NULL;
 
-	if (!ptr)
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskREAD]);
+#endif
 		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;
-	}
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskREAD]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -117,21 +165,15 @@ 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_type = taskWRITE;
-	task->task_root = root;
+	task->task_lock = 0;
 	task->task_func = func;
+	TASK_TYPE(task) = taskWRITE;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_FD(task) = fd;
@@ -141,13 +183,16 @@ schedWrite(sched_root_task_t * __restrict root, sched_
 	else
 		ptr = NULL;
 
-	if (!ptr)
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskWRITE]);
+#endif
 		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;
-	}
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskWRITE]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -172,21 +217,15 @@ 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_type = taskTIMER;
-	task->task_root = root;
+	task->task_lock = 0;
 	task->task_func = func;
+	TASK_TYPE(task) = taskTIMER;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 
@@ -209,6 +248,9 @@ 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);
 #else
@@ -220,11 +262,11 @@ 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;
-	}
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskTIMER]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -247,21 +289,15 @@ 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_type = taskEVENT;
-	task->task_root = root;
+	task->task_lock = 0;
 	task->task_func = func;
+	TASK_TYPE(task) = taskEVENT;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
@@ -271,13 +307,16 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 	else
 		ptr = NULL;
 
-	if (!ptr)
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskEVENT]);
+#endif
 		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;
-	}
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskEVENT]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -301,21 +340,15 @@ 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_type = taskEVENT;
-	task->task_root = root;
+	task->task_lock = 0;
 	task->task_func = func;
+	TASK_TYPE(task) = taskEVENT;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
@@ -325,13 +358,16 @@ schedEventLo(sched_root_task_t * __restrict root, sche
 	else
 		ptr = NULL;
 
-	if (!ptr)
+	if (!ptr) {
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_lock(&root->root_mtx[taskEVENTLO]);
+#endif
 		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;
-	}
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskEVENTLO]);
+#endif
+	} else
+		task = _sched_unuseTask(task);
 
 	return task;
 }
@@ -354,28 +390,21 @@ 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_type = taskEVENT;
-	task->task_root = root;
+	task->task_lock = 0;
 	task->task_func = func;
+	TASK_TYPE(task) = taskEVENT;
+	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
 	TASK_VAL(task) = val;
 
 	ret = schedCall(task);
 
-	task->task_type = taskUNUSE;
-	TAILQ_INSERT_TAIL(&root->root_unuse, task, task_node);
+	_sched_unuseTask(task);
 	return ret;
 }