--- libaitsched/inc/aitsched.h 2012/08/02 13:56:19 1.12 +++ libaitsched/inc/aitsched.h 2012/08/08 08:25:39 1.13 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.12 2012/08/02 13:56:19 misho Exp $ +* $Id: aitsched.h,v 1.13 2012/08/08 08:25:39 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -85,7 +85,7 @@ typedef enum { taskLIO, taskUSER, taskEVENT, - taskEVENTLO, + taskTASK, taskSUSPEND, taskREADY, taskUNUSE, @@ -118,8 +118,8 @@ struct sched_HooksTask { 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; @@ -197,6 +197,8 @@ typedef TAILQ_HEAD(, sched_Task) sched_queue_t; /* root task */ struct sched_RootTask { int root_kq; + unsigned int root_miss; + unsigned int root_task_miss; struct timespec root_wait; struct timespec root_poll; intptr_t root_cond; @@ -215,11 +217,10 @@ struct sched_RootTask { 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; @@ -272,10 +273,18 @@ 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); /* + * schedMissEvents() - Set new miss events rate for regular tasks + * + * @root = root task + * @missEvents = maximum number of missed events before firing tasks + * return: -1 error or 0 ok + */ +inline int schedMissEvents(sched_root_task_t * __restrict root, u_int missEvents); +/* * schedCall() - Call task execution function * * @task = current task @@ -550,19 +559,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