--- libaitsched/inc/aitsched.h	2011/08/05 15:52:00	1.1
+++ libaitsched/inc/aitsched.h	2011/10/04 12:34:33	1.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.1 2011/08/05 15:52:00 misho Exp $
+* $Id: aitsched.h,v 1.2 2011/10/04 12:34:33 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,6 +47,11 @@ SUCH DAMAGE.
 #define __AITSCHED_H
 
 
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/uio.h>
+
+
 /* criteria type */
 #define CRITERIA_CALL	0
 #define CRITERIA_ARG	1
@@ -102,7 +107,7 @@ struct sched_HooksTask {
 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 & queue */
 struct sched_Task {
@@ -110,6 +115,7 @@ struct sched_Task {
 	sched_task_type_t		task_type;
 
 	sched_root_task_t		*task_root;
+#define TASK_ROOT(x)	(x)->task_root
 	sched_task_func_t		task_func;
 
 	void				*task_arg;
@@ -152,6 +158,11 @@ struct sched_RootTask {
 };
 
 
+inline int sched_GetErrno();
+inline const char *sched_GetError();
+inline void sched_SetErr(int, char *, ...);
+
+
 /*
  * schedInit() - Init scheduler
  * @data = optional data if !=NULL
@@ -159,19 +170,19 @@ struct sched_RootTask {
  * return: allocated root task if ok or NULL error
  */
 sched_root_task_t *schedInit(void ** __restrict data, size_t datlen);
-#define schedInitIO()	schedInit(&schedRegisterIO, 0)
+#define schedBegin()	schedInit((void**) &schedRegisterHooks, 0)
 /*
  * schedEnd() - End scheduler & free all resources
  * @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);
 /*
- * schedRegisterIO() - Register IO handles and bind tasks to it
+ * schedRegisterHooks() - Register IO handles and bind tasks to it
  * @root = root task
  * return: -1 error or 0 ok
  */
-int schedRegisterIO(sched_root_task_t * __restrict root);
+int schedRegisterHooks(sched_root_task_t * __restrict root);
 /*
  * schedCall() - Call task execution function
  * @task = current task
@@ -187,9 +198,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
@@ -210,59 +222,59 @@ int schedCancelby(sched_root_task_t * __restrict root,
 
 
 /*
- * schedRead() - Add READ task to scheduler queue
+ * schedRead() - Add READ I/O task to scheduler queue
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like fd handle
+ * @fd = fd handle
  * return: NULL error or !=NULL new queued task
  */
-sched_task_t *schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, ...);
+sched_task_t *schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd);
 /*
- * schedWrite() - Add WRITE task to scheduler queue
+ * schedWrite() - Add WRITE I/O task to scheduler queue
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like fd handle
+ * @fd = fd handle
  * return: NULL error or !=NULL new queued task
  */
-sched_task_t *schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, ...);
+sched_task_t *schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd);
 /*
  * schedTimer() - Add TIMER task to scheduler queue
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments in microSecs, define period 1sec == 1000000
+ * @ms = arguments in microSecs, define period 1sec == 1000000
  * 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, ...);
+sched_task_t *schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned int ms);
 /*
  * schedEvent() - Add EVENT task to scheduler queue
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like u_long
+ * @val = additional func argument
  * return: NULL error or !=NULL new queued task
  */
-sched_task_t *schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, ...);
+sched_task_t *schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned long val);
 /*
  * schedEventLo() - Add EVENT_Lo task to scheduler queue
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like u_long
+ * @val = additional func argument
  * return: NULL error or !=NULL new queued task
  */
-sched_task_t *schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, ...);
+sched_task_t *schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned long val);
 /*
  * schedCallOnce() - Call once from scheduler
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @... = next func arguments, like u_long
- * return: NULL error or !=NULL new queued task
+ * @val = additional func argument
+ * return: return value from called func
  */
-sched_task_t *schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, ...);
+sched_task_t *schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned long val);
 
 
 #endif