--- libaitsched/inc/aitsched.h 2012/08/02 12:32:07 1.11.2.9 +++ libaitsched/inc/aitsched.h 2012/08/23 02:33:12 1.16 @@ -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.16 2012/08/23 02:33:12 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -53,7 +53,8 @@ SUCH DAMAGE. #include #include #include -#if defined(EVFILT_AIO) && defined(SIGEV_KEVENT) +#include +#ifdef EVFILT_LIO #include #endif @@ -82,12 +83,14 @@ typedef enum { taskPROC, taskSIGNAL, taskAIO, + taskLIO, taskUSER, taskEVENT, - taskEVENTLO, + taskTASK, taskSUSPEND, taskREADY, taskUNUSE, + taskTHREAD, taskMAX } sched_task_type_t; @@ -111,16 +114,22 @@ 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; + /* thread(sched_task_t *task, NULL) -> int */ + sched_hook_func_t thread; } hook_add; struct { + /* exit(sched_task_t *task, void *exitValue) -> int */ + sched_hook_func_t exit; /* cancel(sched_task_t *task, NULL) -> int */ sched_hook_func_t cancel; /* resume(sched_task_t *task, NULL) -> int */ @@ -155,16 +164,20 @@ typedef void *(*sched_task_func_t)(sched_task_t * /* c /* task & queue */ struct sched_Task { - volatile int task_lock; uintptr_t task_id; #define TASK_ID(x) ((struct sched_Task*) (x)->task_id) sched_task_type_t task_type; #define TASK_TYPE(x) (x)->task_type + volatile int task_lock; 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 + intptr_t task_ret; +#define TASK_RET(x) (x)->task_ret + unsigned int task_flag; +#define TASK_FLAG(x) (x)->task_flag void *task_arg; union { @@ -194,6 +207,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 +223,14 @@ 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; + sched_queue_t root_thread; hooks_task_t root_hooks; struct iovec root_data; @@ -254,6 +269,20 @@ int schedEnd(sched_root_task_t ** __restrict root); */ int schedRegisterHooks(sched_root_task_t * __restrict root); /* + * sched_useTask() - Get and init new task + * + * @root = root task + * return: NULL error or !=NULL prepared task + */ +inline sched_task_t *sched_useTask(sched_root_task_t * __restrict root); +/* + * sched_unuseTask() - Unlock and put task to unuse queue + * + * @task = task + * return: always is NULL + */ +inline sched_task_t *sched_unuseTask(sched_task_t * __restrict task); +/* * schedPolling() - Polling timeout period if no timer task is present * * @root = root task @@ -268,7 +297,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 +435,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 +477,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 +520,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 +575,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 @@ -589,6 +630,38 @@ sched_task_t *schedCallOnce(sched_root_task_t * __rest 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))) + +/* + * schedThread() - Add thread task to scheduler queue + * + * @root = root task + * @func = task execution function + * @arg = 1st func argument + * @detach = Detach thread from scheduler, if !=0 + * @opt_data = Optional data + * @opt_dlen = Optional data length + * return: NULL error or !=NULL new queued task + */ +sched_task_t *schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, + int detach, void *opt_data, size_t opt_dlen); +#define schedThreadSelf(x) schedThread(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ + TASK_VAL((x)), TASK_DATA((x)), TASK_DATLEN((x))) +/* + * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks + * + * @task = current task + * @retcode = return code + * return: return code + */ +inline void *sched_taskExit(sched_task_t *task, intptr_t retcode); +/* + * taskExit() - Exit helper for scheduler task + * + * @t = current executed task + * @x = exit value for task + * return: none + */ +#define taskExit(t, x) return sched_taskExit((t), (intptr_t) (x)) #endif