--- libaitsched/inc/aitsched.h	2013/10/21 13:38:05	1.23
+++ libaitsched/inc/aitsched.h	2015/07/02 22:45:00	1.28
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.23 2013/10/21 13:38:05 misho Exp $
+* $Id: aitsched.h,v 1.28 2015/07/02 22:45:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2015
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ SUCH DAMAGE.
 
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/event.h>
+#include <sys/select.h>
 #include <sys/uio.h>
 #include <stdint.h>
 #include <pthread.h>
@@ -67,7 +67,8 @@ SUCH DAMAGE.
 #define CRITERIA_VAL	4
 #define CRITERIA_TS	5
 #define CRITERIA_DATA	6
-#define CRITERIA_ID	7
+#define CRITERIA_DATLEN	7
+#define CRITERIA_ID	8
 
 
 /* early declaration for root & task */
@@ -159,6 +160,7 @@ typedef struct sched_HooksTask hooks_task_t;
 
 /* task callback, like pthread callback! */
 typedef void *(*sched_task_func_t)(sched_task_t * /* current task data*/);
+#define SCHED_TASK_DEFINE(x)	void *(x)(sched_task_t*)
 
 /* task lock helpers */
 #define TASK_LOCK(x)		((x)->task_lock = 42)
@@ -193,6 +195,9 @@ struct sched_Task {
 #define TASK_FD(x)	(x)->task_val.fd
 #define TASK_TS(x)	(x)->task_val.ts
 
+#define TASK_TS2TV(x, tvp)	(assert((tvp)), (tvp)->tv_sec = (x)->task_val.ts.tv_sec, \
+					(tvp)->tv_usec = (x)->task_val.ts.tv_nsec / 1000)
+
 	struct iovec			task_data;
 #define TASK_DATA(x)	(x)->task_data.iov_base
 #define TASK_DATLEN(x)	(x)->task_data.iov_len
@@ -210,10 +215,11 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t;
 /* root task */
 struct sched_RootTask {
 	int		root_kq;
-	unsigned long	root_miss;
+	fd_set		root_fds[2];
 	struct timespec	root_wait;
 	struct timespec	root_poll;
-	intptr_t	root_cond;
+	unsigned long	root_miss;
+	intptr_t	root_cond[1];
 	void		*root_ret;
 
 	pthread_mutex_t	root_mtx[taskMAX];
@@ -303,7 +309,7 @@ int schedPolling(sched_root_task_t * __restrict root, 
  * @condValue = condition value, kill schedRun() if condValue == killState
  * return: -1 error or 0 ok
  */
-int schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue);
+int schedTermCondition(sched_root_task_t * __restrict root, intptr_t * __restrict condValue);
 /*
  * schedCall() - Call task execution function
  *
@@ -340,7 +346,7 @@ int schedCancel(sched_task_t * __restrict task);
  * @type = cancel from queue type, if =taskMAX cancel same task from all queues
  * @criteria = find task by criteria 
  * 	[ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|
- * 		CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA ]
+ * 		CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA|CRITERIA_DATLEN ]
  * @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
@@ -361,7 +367,7 @@ int schedQuery(sched_task_t * __restrict task);
  * @type = query from queue type, if =taskMAX query same task from all queues
  * @criteria = find task by criteria 
  * 	[ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|
- * 		CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA ]
+ * 		CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA|CRITERIA_DATLEN ]
  * @param = search parameter
  * return: -1 error, 0 found or 1 not found
  */
@@ -647,7 +653,7 @@ sched_task_t *schedSuspend(sched_root_task_t * __restr
  *
  * @root = root task
  * @criteria = find task by criteria 
- * 	[CRITERIA_ANY|CRITERIA_ID|CRITERIA_DATA]
+ * 	[ CRITERIA_ANY|CRITERIA_ID|CRITERIA_VAL|CRITERIA_DATA ]
  * @param = search parameter (sched_task_t *task| unsigned long id)
  * return: -1 error or 0 resumed ok
  */