--- libaitsched/src/tasks.c	2012/01/08 00:51:17	1.4
+++ libaitsched/src/tasks.c	2012/01/23 15:56:23	1.4.2.2
@@ -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.2 2012/01/23 15:56:23 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;
@@ -91,10 +103,13 @@ _sched_unuseTask(sched_task_t * __restrict 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;
@@ -109,21 +124,30 @@ 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;
 
+	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)
+	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;
@@ -135,10 +159,13 @@ schedRead(sched_root_task_t * __restrict root, sched_t
  * @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;
@@ -153,21 +180,30 @@ 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;
 
+	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)
+	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;
@@ -179,10 +215,13 @@ schedWrite(sched_root_task_t * __restrict root, sched_
  * @func = task execution function
  * @arg = 1st func argument
  * @tv = 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 timeval tv, 
+		void *opt_data, size_t opt_dlen)
 {
 	sched_task_t *task, *t = NULL;
 	void *ptr;
@@ -199,12 +238,15 @@ 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;
 
+	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;
@@ -224,6 +266,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 +280,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);
 
@@ -247,10 +295,13 @@ schedTimer(sched_root_task_t * __restrict root, sched_
  * @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;
@@ -265,21 +316,30 @@ 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;
 
+	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)
+	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;
@@ -292,10 +352,13 @@ schedEvent(sched_root_task_t * __restrict root, sched_
  * @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;
@@ -310,21 +373,30 @@ 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;
 
+	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)
+	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;
@@ -336,10 +408,13 @@ schedEventLo(sched_root_task_t * __restrict root, sche
  * @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;
@@ -354,12 +429,15 @@ 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;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
 
 	ret = schedCall(task);