--- libaitsched/inc/aitsched.h	2011/10/04 13:29:00	1.2.2.1
+++ libaitsched/inc/aitsched.h	2012/01/08 02:01:41	1.4.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.2.2.1 2011/10/04 13:29:00 misho Exp $
+* $Id: aitsched.h,v 1.4.2.1 2012/01/08 02:01:41 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 */
@@ -104,6 +105,8 @@ struct sched_HooksTask {
 		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;
@@ -111,8 +114,14 @@ typedef struct sched_HooksTask hooks_task_t;
 /* task callback, like pthread callback! */
 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;
 
@@ -123,7 +132,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
@@ -139,10 +148,15 @@ struct sched_Task {
 };
 typedef TAILQ_HEAD(, sched_Task) sched_queue_t;
 
+/* root lock helpers */
+#define ROOT_QLOCK(x, q)	(pthread_mutex_lock(&(x)->root_mtx[(q)]))
+#define ROOT_QUNLOCK(x, q)	(pthread_mutex_unlock(&(x)->root_mtx[(q)]))
+
 /* root task */
 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;
@@ -162,7 +176,6 @@ struct sched_RootTask {
 
 inline int sched_GetErrno();
 inline const char *sched_GetError();
-inline void sched_SetErr(int, char *, ...);
 
 
 /*
@@ -217,7 +230,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);
@@ -246,10 +259,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