--- libaitsched/inc/aitsched.h	2011/10/04 12:34:33	1.2
+++ libaitsched/inc/aitsched.h	2011/12/01 00:02:55	1.2.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.2 2011/10/04 12:34:33 misho Exp $
+* $Id: aitsched.h,v 1.2.2.7 2011/12/01 00:02:55 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -50,6 +50,7 @@ SUCH DAMAGE.
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
+#include <stdint.h>
 
 
 /* criteria type */
@@ -96,12 +97,16 @@ 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;
@@ -121,7 +126,7 @@ struct sched_Task {
 	void				*task_arg;
 	union {
 		unsigned long	v;
-		int		fd;
+		intptr_t	fd;
 		struct timeval	tv;
 	}				task_val;
 #define TASK_ARG(x)	(x)->task_arg
@@ -160,7 +165,6 @@ struct sched_RootTask {
 
 inline int sched_GetErrno();
 inline const char *sched_GetError();
-inline void sched_SetErr(int, char *, ...);
 
 
 /*
@@ -215,7 +219,7 @@ int schedCancel(sched_task_t * __restrict task);
  * @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, 
 		u_char criteria, void *param, sched_hook_func_t hook);
@@ -244,10 +248,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