--- libaitsched/inc/aitsched.h 2012/03/13 10:01:59 1.6 +++ libaitsched/inc/aitsched.h 2012/05/30 08:52:45 1.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.6 2012/03/13 10:01:59 misho Exp $ +* $Id: aitsched.h,v 1.9 2012/05/30 08:52:45 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; @@ -133,6 +136,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 { @@ -171,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; @@ -182,6 +187,7 @@ struct sched_RootTask { #define ROOT_DATA(x) (x)->root_data.iov_base #define ROOT_DATLEN(x) (x)->root_data.iov_len }; +#define ROOT_QUEUE_EMPTY(x, _q) TAILQ_EMPTY(&((x)->root_##_q)) inline int sched_GetErrno(); @@ -250,7 +256,7 @@ inline void *schedFetch(sched_root_task_t * __restrict * @killState = kill condition variable, if !=0 stop scheduler loop * return: -1 error or 0 ok */ -int schedRun(sched_root_task_t * __restrict root, volatile intptr_t * __restrict killState); +int schedRun(sched_root_task_t *root, volatile intptr_t * __restrict killState); /* * schedCancel() - Cancel task from scheduler * @@ -263,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 @@ -285,6 +291,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 * @@ -298,7 +306,24 @@ 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))) /* + * schedAlarm() - Add ALARM task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @ts = timeout argument structure, minimum alarm timer resolution is 1msec! + * @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 * * @root = root task @@ -311,6 +336,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 * @@ -324,6 +351,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 * @@ -337,6 +366,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 * @@ -350,6 +381,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