--- libaitsched/inc/aitsched.h	2012/08/21 11:07:16	1.14.2.1
+++ libaitsched/inc/aitsched.h	2012/08/21 13:15:49	1.15.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.15.2.1 2012/08/21 13:15:49 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
@@ -636,12 +655,22 @@ sched_task_t *schedThread(sched_root_task_t * __restri
  */
 #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_hooks.hook_exec.exit((t), \
+							(void*) (x)); \
 				TASK_ROOT(t)->root_ret = (void*) (x); \
-				if (TASK_TYPE(t) == taskTHREAD) \
+				if (TASK_TYPE(t) == taskTHREAD) { \
+					sched_unuseTask(t); \
 					pthread_exit((void*) (x)); \
-				else \
+				} else \
 					return ((void*) (x)); \
+} while (0)
+#define taskKill(t, s)	do { assert((t) && TASK_ROOT(t)); \
+				if (TASK_TYPE(t) == taskTHREAD) { \
+					pthread_t _tid = (pthread_t) TASK_VAL((t)); \
+					sched_unuseTask(t); \
+					pthread_kill(_tid, (s)); \
+				} else \
+					schedCancel((t)); \
 } while (0)