--- libaitsched/inc/aitsched.h	2011/08/12 23:06:55	1.1.1.1.2.2
+++ 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.1.1.1.2.2 2011/08/12 23:06:55 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
@@ -50,6 +50,8 @@ SUCH DAMAGE.
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
+#include <stdint.h>
+#include <pthread.h>
 
 
 /* criteria type */
@@ -69,6 +71,7 @@ typedef enum {
 	taskWRITE,
 	taskTIMER,
 	taskEVENT, 
+	taskEVENTLO, 
 	taskREADY,
 	taskUNUSE,
 	taskMAX
@@ -96,31 +99,43 @@ struct sched_HooksTask {
 		sched_hook_func_t	run;
 		/* fetch(sched_root_task_t *root, NULL) -> sched_task_t* */
 		sched_hook_func_t	fetch;
+		/* exception(sched_root_task_t *root, NULL) -> int */
+		sched_hook_func_t	exception;
 	}	hook_exec;
 	struct {
 		/* init(sched_root_task_t *root, void *data) -> int */
 		sched_hook_func_t	init;
 		/* fini(sched_root_task_t *root, NULL) -> int */
 		sched_hook_func_t	fini;
+		/* error(sched_root_task_t *root, int errno) -> int */
+		sched_hook_func_t	error;
 	}	hook_root;
 };
 typedef struct sched_HooksTask hooks_task_t;
 
 /* task callback, like pthread callback! */
-typedef void *(*sched_task_func_t)(void *);
+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;
+#define TASK_TYPE(x)	(x)->task_type
 
 	sched_root_task_t		*task_root;
+#define TASK_ROOT(x)	(x)->task_root
 	sched_task_func_t		task_func;
 
 	void				*task_arg;
 	union {
 		unsigned long	v;
-		int		fd;
+		intptr_t	fd;
 		struct timeval	tv;
 	}				task_val;
 #define TASK_ARG(x)	(x)->task_arg
@@ -140,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;
@@ -159,7 +175,6 @@ struct sched_RootTask {
 
 inline int sched_GetErrno();
 inline const char *sched_GetError();
-inline void sched_SetErr(int, char *, ...);
 
 
 /*
@@ -175,7 +190,7 @@ sched_root_task_t *schedInit(void ** __restrict data, 
  * @root = root task
  * return: -1 error or 0 ok
  */
-int schedEnd(sched_root_task_t * __restrict root);
+int schedEnd(sched_root_task_t ** __restrict root);
 /*
  * schedRegisterHooks() - Register IO handles and bind tasks to it
  * @root = root task
@@ -197,9 +212,10 @@ inline void *schedFetch(sched_root_task_t * __restrict
 /*
  * schedRun() - Scheduler *run loop*
  * @root = root task
+ * @killState = kill condition variable, if !=0 stop scheduler loop
  * return: -1 error or 0 ok
  */
-int schedRun(sched_root_task_t * __restrict root);
+int schedRun(sched_root_task_t * __restrict root, volatile intptr_t * __restrict killState);
 /*
  * schedCancel() - Cancel task from scheduler
  * @task = task
@@ -209,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 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, 
+int schedCancelby(sched_root_task_t * __restrict root, sched_task_type_t type, 
 		u_char criteria, void *param, sched_hook_func_t hook);
 
 
@@ -242,10 +258,10 @@ sched_task_t *schedWrite(sched_root_task_t * __restric
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @ms = arguments in microSecs, define period 1sec == 1000000
+ * @tv = timeout argument structure
  * return: NULL error or !=NULL new queued task
  */
-sched_task_t *schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned int ms);
+sched_task_t *schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timeval tv);
 /*
  * schedEvent() - Add EVENT task to scheduler queue
  * @root = root task