--- libaitsched/src/tasks.c	2012/08/21 12:50:08	1.12.4.2
+++ libaitsched/src/tasks.c	2014/06/03 20:39:54	1.24.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.12.4.2 2012/08/21 12:50:08 misho Exp $
+* $Id: tasks.c,v 1.24.2.4 2014/06/03 20:39:54 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -52,23 +52,19 @@ SUCH DAMAGE.
  * @root = root task
  * return: NULL error or !=NULL prepared task
  */
-inline sched_task_t *
+sched_task_t *
 sched_useTask(sched_root_task_t * __restrict root)
 {
 	sched_task_t *task, *tmp;
 
+	SCHED_QLOCK(root, taskUNUSE);
 	TAILQ_FOREACH_SAFE(task, &root->root_unuse, task_node, tmp) {
 		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;
 		}
 	}
+	SCHED_QUNLOCK(root, taskUNUSE);
 
 	if (!task) {
 		task = malloc(sizeof(sched_task_t));
@@ -89,21 +85,93 @@ sched_useTask(sched_root_task_t * __restrict root)
  * @task = task
  * return: always is NULL
  */
-inline sched_task_t *
+sched_task_t *
 sched_unuseTask(sched_task_t * __restrict task)
 {
 	TASK_UNLOCK(task);
+
 	TASK_TYPE(task) = taskUNUSE;
+	insert_task_to(task, &(TASK_ROOT(task))->root_unuse);
+
+	task = NULL;
+	return task;
+}
+
+#pragma GCC visibility push(hidden)
+
 #ifdef HAVE_LIBPTHREAD
-	pthread_mutex_lock(&TASK_ROOT(task)->root_mtx[taskUNUSE]);
+void *
+_sched_threadWrapper(sched_task_t *t)
+{
+	void *ret = NULL;
+	sched_root_task_t *r;
+
+	if (!t || !TASK_ROOT(t))
+		pthread_exit(ret);
+	else
+		r = (sched_root_task_t*) TASK_ROOT(t);
+
+	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+	/*
+	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+	*/
+
+	/* notify parent, thread is ready for execution */
+	pthread_testcancel();
+
+	ret = schedCall(t);
+	r->root_ret = ret;
+
+	if (TASK_VAL(t)) {
+		transit_task2unuse(t, &r->root_thread);
+		TASK_VAL(t) = 0;
+	}
+
+	pthread_exit(ret);
+}
 #endif
-	TAILQ_INSERT_TAIL(&TASK_ROOT(task)->root_unuse, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-	pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[taskUNUSE]);
+
+#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE)
+void *
+_sched_rtcWrapper(sched_task_t *t)
+{
+	sched_task_t *task;
+	void *ret;
+
+	if (!t || !TASK_ROOT(t) || !TASK_DATA(t))
+		return NULL;
+	else {
+		task = (sched_task_t*) TASK_DATA(t);
+		timer_delete((timer_t) TASK_DATLEN(t));
+	}
+
+	ret = schedCall(task);
+
+	transit_task2unuse(task, &(TASK_ROOT(task))->root_rtc);
+	return ret;
+}
 #endif
-	task = NULL;
 
-	return task;
+#pragma GCC visibility pop
+
+/*
+ * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks
+ *
+ * @task = current task
+ * @retcode = return code
+ * return: return code
+ */
+void *
+sched_taskExit(sched_task_t *task, intptr_t retcode)
+{
+	if (!task || !TASK_ROOT(task))
+		return (void*) -1;
+
+	if (TASK_ROOT(task)->root_hooks.hook_exec.exit)
+		TASK_ROOT(task)->root_hooks.hook_exec.exit(task, (void*) retcode);
+
+	TASK_ROOT(task)->root_ret = (void*) retcode;
+	return (void*) retcode;
 }
 
 
@@ -132,7 +200,7 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskREAD;
 	TASK_ROOT(task) = root;
 
@@ -147,15 +215,9 @@ schedRead(sched_root_task_t * __restrict root, sched_t
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskREAD]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_read, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskREAD]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_read);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
@@ -186,7 +248,7 @@ schedWrite(sched_root_task_t * __restrict root, sched_
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskWRITE;
 	TASK_ROOT(task) = root;
 
@@ -201,15 +263,9 @@ schedWrite(sched_root_task_t * __restrict root, sched_
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskWRITE]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_write, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskWRITE]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_write);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
@@ -230,6 +286,10 @@ sched_task_t *
 schedNode(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
 		void *opt_data, size_t opt_dlen)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	sched_task_t *task;
 	void *ptr;
 
@@ -240,7 +300,7 @@ schedNode(sched_root_task_t * __restrict root, sched_t
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskNODE;
 	TASK_ROOT(task) = root;
 
@@ -255,18 +315,13 @@ schedNode(sched_root_task_t * __restrict root, sched_t
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskNODE]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_node, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskNODE]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_node);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -284,6 +339,10 @@ sched_task_t *
 schedProc(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long pid, 
 		void *opt_data, size_t opt_dlen)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	sched_task_t *task;
 	void *ptr;
 
@@ -294,7 +353,7 @@ schedProc(sched_root_task_t * __restrict root, sched_t
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskPROC;
 	TASK_ROOT(task) = root;
 
@@ -309,18 +368,13 @@ schedProc(sched_root_task_t * __restrict root, sched_t
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskPROC]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_proc, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskPROC]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_proc);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -338,6 +392,10 @@ sched_task_t *
 schedUser(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long id, 
 		void *opt_data, size_t opt_dlen)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 #ifndef EVFILT_USER
 	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
 	return NULL;
@@ -352,7 +410,7 @@ schedUser(sched_root_task_t * __restrict root, sched_t
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskUSER;
 	TASK_ROOT(task) = root;
 
@@ -367,19 +425,14 @@ schedUser(sched_root_task_t * __restrict root, sched_t
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskUSER]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_user, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskUSER]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_user);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
-#endif
+#endif	/* EVFILT_USER */
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -397,6 +450,10 @@ sched_task_t *
 schedSignal(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long sig, 
 		void *opt_data, size_t opt_dlen)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	sched_task_t *task;
 	void *ptr;
 
@@ -407,7 +464,7 @@ schedSignal(sched_root_task_t * __restrict root, sched
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskSIGNAL;
 	TASK_ROOT(task) = root;
 
@@ -422,18 +479,13 @@ schedSignal(sched_root_task_t * __restrict root, sched
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskSIGNAL]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_signal, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskSIGNAL]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_signal);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -443,7 +495,7 @@ schedSignal(sched_root_task_t * __restrict root, sched
  * @func = task execution function
  * @arg = 1st func argument
  * @ts = timeout argument structure, minimum alarm timer resolution is 1msec!
- * @opt_data = Optional data
+ * @opt_data = Alarm timer ID
  * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
@@ -451,6 +503,10 @@ sched_task_t *
 schedAlarm(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts, 
 		void *opt_data, size_t opt_dlen)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	sched_task_t *task;
 	void *ptr;
 
@@ -461,7 +517,7 @@ schedAlarm(sched_root_task_t * __restrict root, sched_
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskALARM;
 	TASK_ROOT(task) = root;
 
@@ -476,18 +532,13 @@ schedAlarm(sched_root_task_t * __restrict root, sched_
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskALARM]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_alarm, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskALARM]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_alarm);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
+#endif	/* KQ_SUPPORT */
 }
 
 #ifdef AIO_SUPPORT
@@ -506,6 +557,10 @@ sched_task_t *
 schedAIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		struct aiocb * __restrict acb, void *opt_data, size_t opt_dlen)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	sched_task_t *task;
 	void *ptr;
 
@@ -516,7 +571,7 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskAIO;
 	TASK_ROOT(task) = root;
 
@@ -531,18 +586,13 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskAIO]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_aio, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskAIO]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_aio);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -557,10 +607,14 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta
  * @offset = Offset from start of file, if =-1 from current position
  * return: NULL error or !=NULL new queued task
  */
-inline sched_task_t *
+sched_task_t *
 schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
 		void *buffer, size_t buflen, off_t offset)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	struct aiocb *acb;
 	off_t off;
 
@@ -597,6 +651,7 @@ schedAIORead(sched_root_task_t * __restrict root, sche
 	}
 
 	return schedAIO(root, func, arg, acb, buffer, buflen);
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -611,10 +666,14 @@ schedAIORead(sched_root_task_t * __restrict root, sche
  * @offset = Offset from start of file, if =-1 from current position
  * return: NULL error or !=NULL new queued task
  */
-inline sched_task_t *
+sched_task_t *
 schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
 		void *buffer, size_t buflen, off_t offset)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	struct aiocb *acb;
 	off_t off;
 
@@ -651,6 +710,7 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch
 	}
 
 	return schedAIO(root, func, arg, acb, buffer, buflen);
+#endif	/* KQ_SUPPORT */
 }
 
 #ifdef EVFILT_LIO
@@ -669,6 +729,10 @@ sched_task_t *
 schedLIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		struct aiocb ** __restrict acbs, void *opt_data, size_t opt_dlen)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	sched_task_t *task;
 	void *ptr;
 
@@ -679,7 +743,7 @@ schedLIO(sched_root_task_t * __restrict root, sched_ta
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskLIO;
 	TASK_ROOT(task) = root;
 
@@ -694,18 +758,13 @@ schedLIO(sched_root_task_t * __restrict root, sched_ta
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskLIO]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_lio, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskLIO]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_lio);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -724,6 +783,10 @@ sched_task_t *
 schedLIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
 		struct iovec *bufs, size_t nbufs, off_t offset)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	struct sigevent sig;
 	struct aiocb **acb;
 	off_t off;
@@ -778,6 +841,7 @@ schedLIORead(sched_root_task_t * __restrict root, sche
 	}
 
 	return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
+#endif	/* KQ_SUPPORT */
 }
 
 /*
@@ -792,10 +856,14 @@ schedLIORead(sched_root_task_t * __restrict root, sche
  * @offset = Offset from start of file, if =-1 from current position
  * return: NULL error or !=NULL new queued task
  */
-inline sched_task_t *
+sched_task_t *
 schedLIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
 		struct iovec *bufs, size_t nbufs, off_t offset)
 {
+#if SUP_ENABLE != KQ_SUPPORT
+	sched_SetErr(ENOTSUP, "disabled kqueue support");
+	return NULL;
+#else
 	struct sigevent sig;
 	struct aiocb **acb;
 	off_t off;
@@ -850,6 +918,7 @@ schedLIOWrite(sched_root_task_t * __restrict root, sch
 	}
 
 	return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
+#endif	/* KQ_SUPPORT */
 }
 #endif	/* EVFILT_LIO */
 #endif	/* AIO_SUPPORT */
@@ -880,7 +949,7 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskTIMER;
 	TASK_ROOT(task) = root;
 
@@ -908,23 +977,19 @@ schedTimer(sched_root_task_t * __restrict root, sched_
 		ptr = NULL;
 
 	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskTIMER]);
-#endif
+		SCHED_QLOCK(root, taskTIMER);
 #ifdef TIMER_WITHOUT_SORT
-		TAILQ_INSERT_TAIL(&root->root_timer, TASK_ID(task), task_node);
+		TAILQ_INSERT_TAIL(&root->root_timer, task, task_node);
 #else
 		TAILQ_FOREACH_SAFE(t, &root->root_timer, task_node, tmp)
 			if (sched_timespeccmp(&TASK_TS(task), &TASK_TS(t), -) < 1)
 				break;
 		if (!t)
-			TAILQ_INSERT_TAIL(&root->root_timer, TASK_ID(task), task_node);
+			TAILQ_INSERT_TAIL(&root->root_timer, task, task_node);
 		else
-			TAILQ_INSERT_BEFORE(t, TASK_ID(task), task_node);
+			TAILQ_INSERT_BEFORE(t, task, task_node);
 #endif
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskTIMER]);
-#endif
+		SCHED_QUNLOCK(root, taskTIMER);
 	} else
 		task = sched_unuseTask(task);
 
@@ -956,7 +1021,7 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskEVENT;
 	TASK_ROOT(task) = root;
 
@@ -971,15 +1036,9 @@ schedEvent(sched_root_task_t * __restrict root, sched_
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskEVENT]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_event, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskEVENT]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_event);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
@@ -1011,7 +1070,7 @@ schedTask(sched_root_task_t * __restrict root, sched_t
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskTASK;
 	TASK_ROOT(task) = root;
 
@@ -1027,19 +1086,15 @@ schedTask(sched_root_task_t * __restrict root, sched_t
 		ptr = NULL;
 
 	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskTASK]);
-#endif
+		SCHED_QLOCK(root, taskTASK);
 		TAILQ_FOREACH_SAFE(t, &root->root_task, task_node, tmp)
 			if (TASK_VAL(task) < TASK_VAL(t))
 				break;
 		if (!t)
-			TAILQ_INSERT_TAIL(&root->root_task, TASK_ID(task), task_node);
+			TAILQ_INSERT_TAIL(&root->root_task, task, task_node);
 		else
-			TAILQ_INSERT_BEFORE(t, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskTASK]);
-#endif
+			TAILQ_INSERT_BEFORE(t, task, task_node);
+		SCHED_QUNLOCK(root, taskTASK);
 	} else
 		task = sched_unuseTask(task);
 
@@ -1071,7 +1126,7 @@ schedSuspend(sched_root_task_t * __restrict root, sche
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskSUSPEND;
 	TASK_ROOT(task) = root;
 
@@ -1086,15 +1141,9 @@ schedSuspend(sched_root_task_t * __restrict root, sche
 	else
 		ptr = NULL;
 
-	if (!ptr) {
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_lock(&root->root_mtx[taskSUSPEND]);
-#endif
-		TAILQ_INSERT_TAIL(&root->root_suspend, TASK_ID(task), task_node);
-#ifdef HAVE_LIBPTHREAD
-		pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]);
-#endif
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_suspend);
+	else
 		task = sched_unuseTask(task);
 
 	return task;
@@ -1125,7 +1174,7 @@ schedCallOnce(sched_root_task_t * __restrict root, sch
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskEVENT;
 	TASK_ROOT(task) = root;
 
@@ -1147,22 +1196,22 @@ schedCallOnce(sched_root_task_t * __restrict root, sch
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @detach = Detach thread from scheduler, if !=0
+ * @ss = stack size
  * @opt_data = Optional data
  * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 sched_task_t *
-schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int detach, 
-		void *opt_data, size_t opt_dlen)
+schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
+		size_t ss, void *opt_data, size_t opt_dlen)
 {
 #ifndef HAVE_LIBPTHREAD
 	sched_SetErr(ENOTSUP, "Not supported thread tasks");
 	return NULL;
 #endif
 	sched_task_t *task;
-	void *ptr;
 	pthread_attr_t attr;
+	void *ptr;
 
 	if (!root || !func)
 		return NULL;
@@ -1171,7 +1220,7 @@ schedThread(sched_root_task_t * __restrict root, sched
 	if (!(task = sched_useTask(root)))
 		return NULL;
 
-	task->task_func = func;
+	TASK_FUNC(task) = func;
 	TASK_TYPE(task) = taskTHREAD;
 	TASK_ROOT(task) = root;
 
@@ -1181,21 +1230,88 @@ schedThread(sched_root_task_t * __restrict root, sched
 	TASK_DATLEN(task) = opt_dlen;
 
 	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, detach ? 
-			PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE);
+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+	if (ss && (errno = pthread_attr_setstacksize(&attr, ss))) {
+		LOGERR;
+		pthread_attr_destroy(&attr);
+		return sched_unuseTask(task);
+	}
+	if ((errno = pthread_attr_getstacksize(&attr, &ss))) {
+		LOGERR;
+		pthread_attr_destroy(&attr);
+		return sched_unuseTask(task);
+	} else
+		TASK_FLAG(task) = ss;
+
+#ifdef SCHED_RR
+	pthread_attr_setschedpolicy(&attr, SCHED_RR);
+#else
+	pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
+#endif
+
 	if (root->root_hooks.hook_add.thread)
 		ptr = root->root_hooks.hook_add.thread(task, &attr);
 	else
 		ptr = NULL;
-	pthread_attr_destroy(&attr);
 
-	if (!ptr) {
-		pthread_mutex_lock(&root->root_mtx[taskTHREAD]);
-		TAILQ_INSERT_TAIL(&root->root_thread, TASK_ID(task), task_node);
-		pthread_mutex_unlock(&root->root_mtx[taskTHREAD]);
-	} else
+	if (!ptr)
+		insert_task_to(task, &root->root_thread);
+	else
 		task = sched_unuseTask(task);
 
+	pthread_attr_destroy(&attr);
 	return task;
 }
 
+/*
+ * schedRTC() - Add RTC task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @ts = timeout argument structure, minimum alarm timer resolution is 1msec!
+ * @opt_data = Optional RTC ID
+ * @opt_dlen = Optional data length
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *
+schedRTC(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts, 
+		void *opt_data, size_t opt_dlen)
+{
+#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE)
+	sched_task_t *task;
+	void *ptr;
+
+	if (!root || !func)
+		return NULL;
+
+	/* get new task */
+	if (!(task = sched_useTask(root)))
+		return NULL;
+
+	TASK_FUNC(task) = func;
+	TASK_TYPE(task) = taskRTC;
+	TASK_ROOT(task) = root;
+
+	TASK_ARG(task) = arg;
+	TASK_TS(task) = ts;
+
+	TASK_DATA(task) = opt_data;
+	TASK_DATLEN(task) = opt_dlen;
+
+	if (root->root_hooks.hook_add.rtc)
+		ptr = root->root_hooks.hook_add.rtc(task, NULL);
+	else
+		ptr = NULL;
+
+	if (!ptr)
+		insert_task_to(task, &root->root_rtc);
+	else
+		task = sched_unuseTask(task);
+
+	return task;
+#else
+	sched_SetErr(ENOTSUP, "Not supported realtime clock extensions");
+	return NULL;
+#endif
+}