--- libaitsched/inc/aitsched.h	2012/08/21 11:07:16	1.14.2.1
+++ libaitsched/inc/aitsched.h	2012/09/10 15:03:08	1.16.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.14.2.1 2012/08/21 11:07:16 misho Exp $
+* $Id: aitsched.h,v 1.16.2.1 2012/09/10 15:03:08 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -53,6 +53,7 @@ SUCH DAMAGE.
 #include <sys/uio.h>
 #include <stdint.h>
 #include <pthread.h>
+#include <assert.h>
 #ifdef EVFILT_LIO
 #include <aio.h>
 #endif
@@ -173,6 +174,10 @@ struct sched_Task {
 #define TASK_ROOT(x)	(x)->task_root
 	sched_task_func_t		task_func;
 #define TASK_FUNC(x)	(x)->task_func
+	intptr_t			task_ret;
+#define TASK_RET(x)	(x)->task_ret
+	unsigned int			task_flag;
+#define TASK_FLAG(x)	(x)->task_flag
 
 	void				*task_arg;
 	union {
@@ -264,6 +269,20 @@ int schedEnd(sched_root_task_t ** __restrict root);
  */
 int schedRegisterHooks(sched_root_task_t * __restrict root);
 /*
+ * sched_useTask() - Get and init new task
+ *
+ * @root = root task
+ * return: NULL error or !=NULL prepared task
+ */
+inline sched_task_t *sched_useTask(sched_root_task_t * __restrict root);
+/*
+ * sched_unuseTask() - Unlock and put task to unuse queue
+ *
+ * @task = task
+ * return: always is NULL
+ */
+inline sched_task_t *sched_unuseTask(sched_task_t * __restrict task);
+/*
  * schedPolling() - Polling timeout period if no timer task is present
  *
  * @root = root task
@@ -619,30 +638,31 @@ sched_task_t *schedCallOnce(sched_root_task_t * __rest
  * @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);
+		int detach, size_t ss, void *opt_data, size_t opt_dlen);
 #define schedThreadSelf(x)	schedThread(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
-		TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x)))
+		(TASK_FLAG((x)) & 0x1), (size_t) (TASK_FLAG((x)) >> 1), TASK_DATA((x)), TASK_DATLEN((x)))
 /*
- * taskExit() - Exit routine for scheduler task
+ * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks
  *
+ * @task = current task
+ * @retcode = return code
+ * return: return code
+ */
+inline void *sched_taskExit(sched_task_t *task, intptr_t retcode);
+/*
+ * taskExit() - Exit helper for scheduler task
+ *
  * @t = current executed task
  * @x = exit value for task
  * return: none
  */
-#define taskExit(t, x)	do { assert((t) && TASK_ROOT(t)); \
-				if (TASK_ROOT(t)->root_hooks.hook_exec.exit) \
-					TASK_ROOT(t)->root_hooks.hook_exec.exit((t), (x)); \
-				TASK_ROOT(t)->root_ret = (void*) (x); \
-				if (TASK_TYPE(t) == taskTHREAD) \
-					pthread_exit((void*) (x)); \
-				else \
-					return ((void*) (x)); \
-} while (0)
+#define taskExit(t, x)		return sched_taskExit((t), (intptr_t) (x))
 
 
 #endif