--- libaitsched/inc/aitsched.h 2012/07/30 00:20:26 1.11.2.1 +++ libaitsched/inc/aitsched.h 2012/08/01 12:49:26 1.11.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.11.2.1 2012/07/30 00:20:26 misho Exp $ +* $Id: aitsched.h,v 1.11.2.2 2012/08/01 12:49:26 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -76,8 +76,9 @@ typedef enum { taskALARM, taskNODE, taskPROC, - taskUSER, taskSIGNAL, + taskAIO, + taskUSER, taskEVENT, taskEVENTLO, taskSUSPEND, @@ -102,10 +103,12 @@ struct sched_HooksTask { sched_hook_func_t node; /* proc(sched_task_t *task, NULL) -> int */ sched_hook_func_t proc; - /* user(sched_task_t *task, NULL) -> int */ - sched_hook_func_t user; /* signal(sched_task_t *task, NULL) -> int */ sched_hook_func_t signal; + /* aio(sched_task_t *task, NULL) -> int */ + sched_hook_func_t aio; + /* user(sched_task_t *task, NULL) -> int */ + sched_hook_func_t user; /* event(sched_task_t *task, NULL) -> int */ sched_hook_func_t event; /* eventlo(sched_task_t *task, NULL) -> int */ @@ -200,8 +203,9 @@ struct sched_RootTask { sched_queue_t root_alarm; sched_queue_t root_node; sched_queue_t root_proc; - sched_queue_t root_user; sched_queue_t root_signal; + sched_queue_t root_aio; + sched_queue_t root_user; sched_queue_t root_event; sched_queue_t root_eventlo; sched_queue_t root_suspend; @@ -396,6 +400,22 @@ sched_task_t *schedProc(sched_root_task_t * __restrict sched_task_t *schedSignal(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, unsigned long sig, void *opt_data, size_t opt_dlen); #define schedSignalSelf(x) schedSignal(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ + TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x))) + +/* + * schedAIO() - Add AIO task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @acb = AIO cb structure address + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t *schedAIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + unsigned long acb, void *opt_data, size_t opt_dlen); +#define schedAIOSelf(x) schedAIO(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x))) /*