--- libaitsched/inc/aitsched.h	2012/05/15 14:33:21	1.7.2.1
+++ libaitsched/inc/aitsched.h	2012/05/30 08:07:44	1.8.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.7.2.1 2012/05/15 14:33:21 misho Exp $
+* $Id: aitsched.h,v 1.8.2.1 2012/05/30 08:07:44 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -59,7 +59,7 @@ SUCH DAMAGE.
 #define CRITERIA_ARG	1
 #define CRITERIA_FD	2
 #define CRITERIA_VAL	3
-#define CRITERIA_TV	4
+#define CRITERIA_TS	4
 
 
 /* early declaration for root & task */
@@ -70,8 +70,9 @@ typedef enum {
 	taskREAD = 0,
 	taskWRITE,
 	taskTIMER,
-	taskEVENT, 
-	taskEVENTLO, 
+	taskEVENT,
+	taskEVENTLO,
+	taskALARM,
 	taskREADY,
 	taskUNUSE,
 	taskMAX
@@ -89,6 +90,8 @@ struct sched_HooksTask {
 		sched_hook_func_t	event;
 		/* eventlo(sched_task_t *task, NULL) -> int */
 		sched_hook_func_t	eventlo;
+		/* alarm(sched_task_t *task, NULL) -> int */
+		sched_hook_func_t	alarm;
 		/* timer(sched_task_t *task, struct timespec *ts) -> int */
 		sched_hook_func_t	timer;
 	}	hook_add;
@@ -172,6 +175,7 @@ struct sched_RootTask {
 	sched_queue_t	root_read;
 	sched_queue_t	root_write;
 	sched_queue_t	root_timer;
+	sched_queue_t	root_alarm;
 	sched_queue_t	root_event;
 	sched_queue_t	root_ready;
 	sched_queue_t	root_unuse;
@@ -265,7 +269,7 @@ int schedCancel(sched_task_t * __restrict task);
  *
  * @root = root task
  * @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]
+ * @criteria = find task by criteria [CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TS]
  * @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
@@ -304,6 +308,21 @@ sched_task_t *schedWrite(sched_root_task_t * __restric
 		int fd, void *opt_data, size_t opt_dlen);
 #define schedWriteSelf(x)	schedWrite(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
 		TASK_FD((x)), TASK_DATA((x)), TASK_DATLEN((x)))
+/*
+ * schedAlarm() - Add ALARM task to scheduler queue
+ *
+ * @root = root task
+ * @func = task execution function
+ * @arg = 1st func argument
+ * @ts = timeout argument structure
+ * @opt_data = Optional data
+ * @opt_dlen = Optional data length
+ * return: NULL error or !=NULL new queued task
+ */
+sched_task_t *schedAlarm(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
+		struct timespec ts, void *opt_data, size_t opt_dlen);
+#define schedAlarmSelf(x)	schedAlarm(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
+		TASK_TS((x)), TASK_DATA((x)), TASK_DATLEN((x)))
 /*
  * schedTimer() - Add TIMER task to scheduler queue
  *