--- libaitsched/inc/aitsched.h	2011/10/04 23:03:31	1.2.2.4
+++ libaitsched/inc/aitsched.h	2011/12/08 09:17:34	1.3.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.2.2.4 2011/10/04 23:03:31 misho Exp $
+* $Id: aitsched.h,v 1.3.2.1 2011/12/08 09:17:34 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -50,6 +50,7 @@ SUCH DAMAGE.
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
+#include <stdint.h>
 
 
 /* criteria type */
@@ -113,8 +114,14 @@ typedef struct sched_HooksTask hooks_task_t;
 /* task callback, like pthread callback! */
 typedef void *(*sched_task_func_t)(sched_task_t * /* current task data*/);
 
+/* task lock helpers */
+#define TASK_LOCK(x)		((x)->task_lock++)
+#define TASK_UNLOCK(x)		((x)->task_lock ^= (x)->task_lock)
+#define TASK_ISLOCKED(x)	((x)->task_lock)
+
 /* task & queue */
 struct sched_Task {
+	volatile int			task_lock;
 	unsigned int			task_id;
 	sched_task_type_t		task_type;
 
@@ -164,7 +171,6 @@ struct sched_RootTask {
 
 inline int sched_GetErrno();
 inline const char *sched_GetError();
-inline void sched_SetErr(int, char *, ...);
 
 
 /*
@@ -219,7 +225,7 @@ int schedCancel(sched_task_t * __restrict task);
  * @criteria = find task by criteria [CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TV]
  * @param = search parameter
  * @hook = custom cleanup hook function, may be NULL
- * return: -1 error or 0 ok
+ * return: -1 error, -2 error in sub-stage cancel execution, -3 error from custom hook or 0 ok
  */
 int schedCancelby(sched_root_task_t * __restrict root, sched_queue_t * __restrict queue, 
 		u_char criteria, void *param, sched_hook_func_t hook);