--- libaitsched/inc/aitsched.h	2012/01/08 00:51:17	1.4
+++ libaitsched/inc/aitsched.h	2012/01/08 03:53:35	1.4.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.4 2012/01/08 00:51:17 misho Exp $
+* $Id: aitsched.h,v 1.4.2.3 2012/01/08 03:53:35 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -51,6 +51,7 @@ SUCH DAMAGE.
 #include <sys/queue.h>
 #include <sys/uio.h>
 #include <stdint.h>
+#include <pthread.h>
 
 
 /* criteria type */
@@ -70,6 +71,7 @@ typedef enum {
 	taskWRITE,
 	taskTIMER,
 	taskEVENT, 
+	taskEVENTLO, 
 	taskREADY,
 	taskUNUSE,
 	taskMAX
@@ -124,6 +126,7 @@ struct sched_Task {
 	volatile int			task_lock;
 	unsigned int			task_id;
 	sched_task_type_t		task_type;
+#define TASK_TYPE(x)	(x)->task_type
 
 	sched_root_task_t		*task_root;
 #define TASK_ROOT(x)	(x)->task_root
@@ -152,6 +155,7 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t;
 struct sched_RootTask {
 	int		root_kq;
 	struct timeval	root_wait;
+	pthread_mutex_t	root_mtx[taskMAX];
 
 	sched_queue_t	root_read;
 	sched_queue_t	root_write;
@@ -221,13 +225,13 @@ int schedCancel(sched_task_t * __restrict task);
 /*
  * schedCancelby() - Cancel task from scheduler by criteria
  * @root = root task
- * @queue = cancel from queue, if =NULL cancel same task from all queues
+ * @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_TV]
  * @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
  */
-int schedCancelby(sched_root_task_t * __restrict root, sched_queue_t * __restrict queue, 
+int schedCancelby(sched_root_task_t * __restrict root, sched_task_type_t type, 
 		u_char criteria, void *param, sched_hook_func_t hook);