--- libaitsched/src/aitsched.c	2012/05/31 14:17:59	1.9.2.1
+++ libaitsched/src/aitsched.c	2012/05/31 21:36:40	1.9.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.9.2.1 2012/05/31 14:17:59 misho Exp $
+* $Id: aitsched.c,v 1.9.2.2 2012/05/31 21:36:40 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -208,44 +208,33 @@ schedEnd(sched_root_task_t ** __restrict root)
 	if (!root || !*root)
 		return -1;
 
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_read, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_read, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_alarm, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_alarm, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_node, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_node, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_proc, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_proc, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_signal, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_signal, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, task_node, tmp)
 		schedCancel(task);
-	}
-	TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp)
 		schedCancel(task);
-	}
 
 #ifdef HAVE_LIBPTHREAD
 	pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]);
 #endif
-	while ((task = TAILQ_FIRST(&(*root)->root_unuse))) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_unuse, task_node, tmp) {
 		TAILQ_REMOVE(&(*root)->root_unuse, task, task_node);
 		free(task);
 	}
@@ -283,7 +272,6 @@ schedCall(sched_task_t * __restrict task)
 	if (!TASK_ISLOCKED(task))
 		TASK_LOCK(task);
 
-	task->task_id++;
 	ptr = task->task_func(task);
 
 	TASK_UNLOCK(task);
@@ -399,7 +387,7 @@ schedCancel(sched_task_t * __restrict task)
 #ifdef HAVE_LIBPTHREAD
 		pthread_mutex_lock(&TASK_ROOT(task)->root_mtx[TASK_TYPE(task)]);
 #endif
-		TAILQ_REMOVE(queue, task, task_node);
+		TAILQ_REMOVE(queue, TASK_ID(task), task_node);
 #ifdef HAVE_LIBPTHREAD
 		pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[TASK_TYPE(task)]);
 #endif
@@ -415,7 +403,8 @@ 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
@@ -430,6 +419,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 
 	if (!root)
 		return -1;
+	/* if type == taskMAX check in all queues */
 	if (type == taskMAX) {
 		if (schedCancelby(root, taskREAD, criteria, param, hook))
 			return -2;
@@ -455,6 +445,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 			return -2;
 		return 0;
 	}
+	/* choosen queue */
 	switch (type) {
 		case taskREAD:
 			queue = &root->root_read;
@@ -499,6 +490,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 	TAILQ_FOREACH_SAFE(task, queue, task_node, tmp) {
 		flg ^= flg;
 		switch (criteria) {
+			case CRITERIA_ANY:
+				flg = 1;
+				break;
 			case CRITERIA_CALL:
 				if (TASK_FUNC(task) == (sched_task_func_t) param)
 					flg = 1;
@@ -527,7 +521,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch
 				sched_SetErr(EINVAL, "Invalid parameter criteria %d", criteria);
 				flg = -1;
 		}
-		if (flg < 0)
+		if (flg < 0)		/* error */
 			break;
 		/* cancel choosen task */
 		if (flg > 0) {