--- libaitsched/inc/aitsched.h	2012/05/14 12:09:12	1.7
+++ libaitsched/inc/aitsched.h	2012/05/19 00:46:53	1.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.h,v 1.7 2012/05/14 12:09:12 misho Exp $
+* $Id: aitsched.h,v 1.8 2012/05/19 00:46:53 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 */
@@ -133,6 +133,7 @@ struct sched_Task {
 	sched_root_task_t		*task_root;
 #define TASK_ROOT(x)	(x)->task_root
 	sched_task_func_t		task_func;
+#define TASK_FUNC(x)	(x)->task_func
 
 	void				*task_arg;
 	union {
@@ -264,7 +265,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
@@ -286,6 +287,8 @@ int schedCancelby(sched_root_task_t * __restrict root,
  */
 sched_task_t *schedRead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		int fd, void *opt_data, size_t opt_dlen);
+#define schedReadSelf(x)	schedRead(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
+		TASK_FD((x)), TASK_DATA((x)), TASK_DATLEN((x)))
 /*
  * schedWrite() - Add WRITE I/O task to scheduler queue
  *
@@ -299,6 +302,8 @@ sched_task_t *schedRead(sched_root_task_t * __restrict
  */
 sched_task_t *schedWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		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)))
 /*
  * schedTimer() - Add TIMER task to scheduler queue
  *
@@ -312,6 +317,8 @@ sched_task_t *schedWrite(sched_root_task_t * __restric
  */
 sched_task_t *schedTimer(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		struct timespec ts, void *opt_data, size_t opt_dlen);
+#define schedTimerSelf(x)	schedTimer(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
+		TASK_TS((x)), TASK_DATA((x)), TASK_DATLEN((x)))
 /*
  * schedEvent() - Add EVENT task to scheduler queue
  *
@@ -325,6 +332,8 @@ sched_task_t *schedTimer(sched_root_task_t * __restric
  */
 sched_task_t *schedEvent(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		unsigned long val, void *opt_data, size_t opt_dlen);
+#define schedEventSelf(x)	schedEvent(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
+		TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x)))
 /*
  * schedEventLo() - Add EVENT_Lo task to scheduler queue
  *
@@ -338,6 +347,8 @@ sched_task_t *schedEvent(sched_root_task_t * __restric
  */
 sched_task_t *schedEventLo(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		unsigned long val, void *opt_data, size_t opt_dlen);
+#define schedEventLoSelf(x)	schedEventLo(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
+		TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x)))
 /*
  * schedCallOnce() - Call once from scheduler
  *
@@ -351,6 +362,8 @@ sched_task_t *schedEventLo(sched_root_task_t * __restr
  */
 sched_task_t *schedCallOnce(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, 
 		unsigned long val, void *opt_data, size_t opt_dlen);
+#define schedCallAgain(x)	schedCallOnce(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \
+		TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x)))
 
 
 #endif