--- libaitsched/inc/aitsched.h 2012/08/02 12:19:29 1.11.2.8 +++ libaitsched/inc/aitsched.h 2012/08/02 13:56:19 1.12 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.11.2.8 2012/08/02 12:19:29 misho Exp $ +* $Id: aitsched.h,v 1.12 2012/08/02 13:56:19 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -53,7 +53,7 @@ SUCH DAMAGE. #include #include #include -#ifdef EVFILT_AIO +#ifdef EVFILT_LIO #include #endif @@ -82,6 +82,7 @@ typedef enum { taskPROC, taskSIGNAL, taskAIO, + taskLIO, taskUSER, taskEVENT, taskEVENTLO, @@ -111,6 +112,8 @@ 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 */ @@ -209,6 +212,7 @@ 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; @@ -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))) -#ifdef EVFILT_AIO +#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