--- libaitsched/src/aitsched.c 2013/08/15 19:10:48 1.19 +++ libaitsched/src/aitsched.c 2013/10/21 13:40:31 1.19.12.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.19 2013/08/15 19:10:48 misho Exp $ +* $Id: aitsched.c,v 1.19.12.2 2013/10/21 13:40:31 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -360,6 +360,232 @@ schedTrigger(sched_task_t * __restrict task) } /* + * schedQuery() - Query task in scheduler + * + * @task = task + * return: -1 error, 0 found and 1 not found + */ +int +schedQuery(sched_task_t * __restrict task) +{ + sched_queue_t *queue; + sched_task_t *t; + + if (!task || !TASK_ROOT(task)) + return -1; /* error */ + + switch (TASK_TYPE(task)) { + case taskREAD: + queue = &TASK_ROOT(task)->root_read; + break; + case taskWRITE: + queue = &TASK_ROOT(task)->root_write; + break; + case taskTIMER: + queue = &TASK_ROOT(task)->root_timer; + break; + case taskALARM: + queue = &TASK_ROOT(task)->root_alarm; + break; + case taskRTC: + queue = &TASK_ROOT(task)->root_rtc; + break; + case taskNODE: + queue = &TASK_ROOT(task)->root_node; + break; + case taskPROC: + queue = &TASK_ROOT(task)->root_proc; + break; + case taskSIGNAL: + queue = &TASK_ROOT(task)->root_signal; + break; + case taskAIO: + queue = &TASK_ROOT(task)->root_aio; + break; + case taskLIO: + queue = &TASK_ROOT(task)->root_lio; + break; + case taskUSER: + queue = &TASK_ROOT(task)->root_user; + break; + case taskEVENT: + queue = &TASK_ROOT(task)->root_event; + break; + case taskTASK: + queue = &TASK_ROOT(task)->root_task; + break; + case taskSUSPEND: + queue = &TASK_ROOT(task)->root_suspend; + break; + case taskREADY: + queue = &TASK_ROOT(task)->root_ready; + break; + case taskTHREAD: + queue = &TASK_ROOT(task)->root_thread; + break; + default: + return 1; /* not in queue */ + } + if (queue) + TAILQ_FOREACH(t, queue, task_node) + if (TASK_ID(t) == TASK_ID(task)) + return 0; /* found */ + + return 1; /* not in queue */ +} + +/* + * schedQueryby() - Query task in scheduler by criteria + * + * @root = root task + * @type = query from queue type, if =taskMAX query same task from all queues + * @criteria = find task by criteria + * [ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL| + * CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA ] + * @param = search parameter + * return: -1 error, 0 found or 1 not found + */ +int +schedQueryby(sched_root_task_t * __restrict root, sched_task_type_t type, + u_char criteria, void *param) +{ + sched_task_t *task; + sched_queue_t *queue; + register int flg = 0; + + if (!root) + return -1; + /* if type == taskMAX check in all queues */ + if (type == taskMAX) { + if ((flg = schedQueryby(root, taskREAD, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskWRITE, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskTIMER, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskALARM, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskRTC, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskNODE, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskPROC, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskSIGNAL, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskAIO, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskLIO, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskUSER, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskEVENT, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskTASK, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskSUSPEND, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskREADY, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskTHREAD, criteria, param)) < 1) + return flg; + return 1; /* not found */ + } + /* choosen queue */ + switch (type) { + case taskREAD: + queue = &root->root_read; + break; + case taskWRITE: + queue = &root->root_write; + break; + case taskTIMER: + queue = &root->root_timer; + break; + case taskALARM: + queue = &root->root_alarm; + break; + case taskRTC: + queue = &root->root_rtc; + break; + case taskNODE: + queue = &root->root_node; + break; + case taskPROC: + queue = &root->root_proc; + break; + case taskSIGNAL: + queue = &root->root_signal; + break; + case taskAIO: + queue = &root->root_aio; + break; + case taskLIO: + queue = &root->root_lio; + break; + case taskUSER: + queue = &root->root_user; + break; + case taskEVENT: + queue = &root->root_event; + break; + case taskTASK: + queue = &root->root_task; + break; + case taskSUSPEND: + queue = &root->root_suspend; + break; + case taskREADY: + queue = &root->root_ready; + break; + case taskTHREAD: + queue = &root->root_thread; + break; + default: + return 1; /* not found */ + } + + TAILQ_FOREACH(task, queue, task_node) { + switch (criteria) { + case CRITERIA_ANY: + return 0; /* found */ + case CRITERIA_CALL: + if (TASK_FUNC(task) == (sched_task_func_t) param) + return 0; /* found */ + break; + case CRITERIA_ARG: + if (TASK_ARG(task) == param) + return 0; /* found */ + break; + case CRITERIA_FD: + if (TASK_FD(task) == (intptr_t) param) + return 0; /* found */ + break; + case CRITERIA_ID: + case CRITERIA_VAL: + if (TASK_VAL(task) == (u_long) param) + return 0; /* found */ + break; + case CRITERIA_TS: + if (!sched_timespeccmp(&TASK_TS(task), + (struct timespec*) param, -)) + return 0; /* found */ + break; + case CRITERIA_DATA: + if (TASK_DATA(task) == param) + return 0; /* found */ + break; + default: + sched_SetErr(EINVAL, "Invalid parameter criteria %d", + criteria); + return 1; /* not found */ + } + } + + return 1; /* not found */ +} + +/* * schedCancel() - Cancel task from scheduler * * @task = task @@ -450,7 +676,8 @@ schedCancel(sched_task_t * __restrict task) * @root = root task * @type = cancel from queue type, if =taskMAX cancel same task from all queues * @criteria = find task by criteria - * [CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA] + * [ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL| + * CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA ] * @param = search parameter * @hook = custom cleanup hook function, may be NULL * return: -1 error, -2 error in sub-stage cancel execution, -3 error from custom hook or 0 ok @@ -715,7 +942,7 @@ schedTermCondition(sched_root_task_t * __restrict root * @root = root task * @criteria = find task by criteria * [CRITERIA_ANY|CRITERIA_ID|CRITERIA_DATA] - * @param = search parameter (sched_task_t *task| u_long id) + * @param = search parameter (sched_task_t *task| unsigned long id) * return: -1 error or 0 resumed ok */ int