--- libaitsched/inc/aitsched.h	2012/08/21 12:54:39	1.15
+++ libaitsched/inc/aitsched.h	2012/08/23 02:33:12	1.16
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.15 2012/08/21 12:54:39 misho Exp $
+* $Id: aitsched.h,v 1.16 2012/08/23 02:33:12 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -647,23 +647,21 @@ sched_task_t *schedThread(sched_root_task_t * __restri
 #define schedThreadSelf(x)	schedThread(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
 		TASK_VAL((x)), 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), \
-							(void*) (x)); \
-				TASK_ROOT(t)->root_ret = (void*) (x); \
-				if (TASK_TYPE(t) == taskTHREAD) { \
-					sched_unuseTask(t); \
-					pthread_exit((void*) (x)); \
-				} else \
-					return ((void*) (x)); \
-} while (0)
+#define taskExit(t, x)		return sched_taskExit((t), (intptr_t) (x))
 
 
 #endif