--- libaitsched/inc/aitsched.h	2012/05/31 14:45:10	1.9.2.2
+++ libaitsched/inc/aitsched.h	2012/05/31 21:36:40	1.9.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.9.2.2 2012/05/31 14:45:10 misho Exp $
+* $Id: aitsched.h,v 1.9.2.3 2012/05/31 21:36:40 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -55,12 +55,13 @@ SUCH DAMAGE.
 
 
 /* criteria type */
-#define CRITERIA_CALL	0
-#define CRITERIA_ARG	1
-#define CRITERIA_FD	2
-#define CRITERIA_VAL	3
-#define CRITERIA_TS	4
-#define CRITERIA_DATA	5
+#define CRITERIA_ANY	0
+#define CRITERIA_CALL	1
+#define CRITERIA_ARG	2
+#define CRITERIA_FD	3
+#define CRITERIA_VAL	4
+#define CRITERIA_TS	5
+#define CRITERIA_DATA	6
 
 
 /* early declaration for root & task */
@@ -135,14 +136,15 @@ typedef struct sched_HooksTask hooks_task_t;
 typedef void *(*sched_task_func_t)(sched_task_t * /* current task data*/);
 
 /* task lock helpers */
-#define TASK_LOCK(x)		((x)->task_lock++)
+#define TASK_LOCK(x)		((x)->task_lock = 42)
 #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;
+	uintptr_t			task_id;
+#define TASK_ID(x)	((struct sched_Task*) (x)->task_id)
 	sched_task_type_t		task_type;
 #define TASK_TYPE(x)	(x)->task_type
 
@@ -286,7 +288,8 @@ int schedCancel(sched_task_t * __restrict task);
  *
  * @root = root task
  * @type = cancel from queue type, if =taskMAX cancel same task from all queues
- * @criteria = find task by criteria [CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TS|CRITERIA_DATA]
+ * @criteria = find task by criteria 
+ * 	[CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TS|CRITERIA_DATA]
  * @param = search parameter
  * @hook = custom cleanup hook function, may be NULL
  * return: -1 error, -2 error in sub-stage cancel execution, -3 error from custom hook or 0 ok