--- libaitsched/inc/aitsched.h 2012/08/02 12:32:07 1.11.2.9 +++ libaitsched/inc/aitsched.h 2012/08/08 23:04:41 1.14 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.11.2.9 2012/08/02 12:32:07 misho Exp $ +* $Id: aitsched.h,v 1.14 2012/08/08 23:04:41 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -53,7 +53,7 @@ SUCH DAMAGE. #include #include #include -#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT) +#ifdef EVFILT_LIO #include #endif @@ -82,9 +82,10 @@ typedef enum { taskPROC, taskSIGNAL, taskAIO, + taskLIO, taskUSER, taskEVENT, - taskEVENTLO, + taskTASK, taskSUSPEND, taskREADY, taskUNUSE, @@ -111,12 +112,14 @@ struct sched_HooksTask { sched_hook_func_t signal; /* aio(sched_task_t *task, NULL) -> int */ sched_hook_func_t aio; + /* lio(sched_task_t *task, NULL) -> int */ + sched_hook_func_t lio; /* 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 */ - sched_hook_func_t eventlo; + /* task(sched_task_t *task, NULL) -> int */ + sched_hook_func_t task; /* suspend(sched_task_t *task, NULL) -> int */ sched_hook_func_t suspend; } hook_add; @@ -194,6 +197,7 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t; /* root task */ struct sched_RootTask { int root_kq; + unsigned long root_miss; struct timespec root_wait; struct timespec root_poll; intptr_t root_cond; @@ -209,13 +213,13 @@ struct sched_RootTask { sched_queue_t root_proc; sched_queue_t root_signal; sched_queue_t root_aio; + sched_queue_t root_lio; sched_queue_t root_user; sched_queue_t root_event; - sched_queue_t root_eventlo; + sched_queue_t root_task; sched_queue_t root_suspend; sched_queue_t root_ready; sched_queue_t root_unuse; - int root_eventlo_miss; hooks_task_t root_hooks; struct iovec root_data; @@ -268,7 +272,7 @@ inline int schedPolling(sched_root_task_t * __restrict * * @root = root task * @condValue = condition value, kill schedRun() if condValue == killState - * return: -1 error ok 0 ok + * return: -1 error or 0 ok */ inline int schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue); /* @@ -406,7 +410,7 @@ sched_task_t *schedSignal(sched_root_task_t * __restri #define schedSignalSelf(x) schedSignal(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x))) -#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT) +#ifdef EVFILT_LIO /* * schedAIO() - Add AIO task to scheduler queue * @@ -448,8 +452,21 @@ inline sched_task_t *schedAIORead(sched_root_task_t * */ inline sched_task_t *schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, void *buffer, size_t buflen, off_t offset); -#ifdef EVFILT_LIO + /* + * schedLIO() - Add AIO bulk tasks to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @acbs = AIO cb structure addresses + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t *schedLIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + struct aiocb ** __restrict acbs, void *opt_data, size_t opt_dlen); +/* * schedLIORead() - Add list of AIO read tasks to scheduler queue * * @root = root task @@ -478,7 +495,6 @@ inline sched_task_t *schedLIORead(sched_root_task_t * inline sched_task_t *schedLIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, struct iovec *bufs, size_t nbufs, off_t offset); #endif /* EVFILT_LIO */ -#endif /* EVFILT_AIO */ /* * schedUser() - Add trigger USER task to scheduler queue @@ -534,19 +550,19 @@ sched_task_t *schedEvent(sched_root_task_t * __restric #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 + * schedTask() - Add regular task to scheduler queue * * @root = root task * @func = task execution function * @arg = 1st func argument - * @val = additional func argument + * @prio = regular task priority, 0 is hi priority for regular tasks * @opt_data = Optional data * @opt_dlen = Optional data length * 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, - unsigned long val, void *opt_data, size_t opt_dlen); -#define schedEventLoSelf(x) schedEventLo(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ +sched_task_t *schedTask(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + unsigned long prio, void *opt_data, size_t opt_dlen); +#define schedTaskSelf(x) schedTask(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x))) /* * schedSuspend() - Add Suspended task to scheduler queue