--- libaitsched/src/tasks.c	2012/01/08 00:51:17	1.4
+++ 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.4 2012/01/08 00:51:17 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
@@ -55,7 +55,13 @@ _sched_useTask(sched_root_task_t * __restrict root)
 
 	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;
 		}
 	}
@@ -75,8 +81,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, task_node);
+#ifdef HAVE_LIBPTHREAD
+	pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[taskUNUSE]);
+#endif
 	task = NULL;
 
 	return task;
@@ -109,9 +121,9 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 	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;
@@ -121,9 +133,15 @@ 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
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskREAD]);
+#endif
+	} else
 		task = _sched_unuseTask(task);
 
 	return task;
@@ -153,9 +171,9 @@ schedWrite(sched_root_task_t * __restrict root, sched_
 	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;
@@ -165,9 +183,15 @@ 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
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskWRITE]);
+#endif
+	} else
 		task = _sched_unuseTask(task);
 
 	return task;
@@ -199,9 +223,9 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 	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;
 
@@ -224,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
@@ -235,6 +262,9 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 		else
 			TAILQ_INSERT_BEFORE(t, task, task_node);
 #endif
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskTIMER]);
+#endif
 	} else
 		task = _sched_unuseTask(task);
 
@@ -265,9 +295,9 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 	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;
@@ -277,9 +307,15 @@ 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
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskEVENT]);
+#endif
+	} else
 		task = _sched_unuseTask(task);
 
 	return task;
@@ -310,9 +346,9 @@ schedEventLo(sched_root_task_t * __restrict root, sche
 	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;
@@ -322,9 +358,15 @@ 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
+#ifdef HAVE_LIBPTHREAD
+		pthread_mutex_unlock(&root->root_mtx[taskEVENTLO]);
+#endif
+	} else
 		task = _sched_unuseTask(task);
 
 	return task;
@@ -354,9 +396,9 @@ schedCallOnce(sched_root_task_t * __restrict root, sch
 	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;