--- libaitsched/inc/aitsched.h 2013/08/15 19:45:30 1.20.2.1 +++ libaitsched/inc/aitsched.h 2013/10/21 13:32:05 1.22.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.h,v 1.20.2.1 2013/08/15 19:45:30 misho Exp $ +* $Id: aitsched.h,v 1.22.4.1 2013/10/21 13:32:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -339,13 +339,34 @@ int 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 */ int schedCancelby(sched_root_task_t * __restrict root, sched_task_type_t type, - u_char criteria, void *param, sched_hook_func_t hook); + unsigned char criteria, void *param, sched_hook_func_t hook); +/* + * schedQuery() - Query task in scheduler + * + * @task = task + * return: -1 error, 0 found and 1 not found + */ +int schedQuery(sched_task_t * __restrict task); +/* + * 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, + unsigned char criteria, void *param); /* @@ -627,7 +648,7 @@ sched_task_t *schedSuspend(sched_root_task_t * __restr * @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 schedResumeby(sched_root_task_t * __restrict root, unsigned char criteria, void *param); @@ -654,16 +675,15 @@ sched_task_t *schedCallOnce(sched_root_task_t * __rest * @root = root task * @func = task execution function * @arg = 1st func argument - * @detach = Detach thread from scheduler, if !=0 * @ss = stack size * @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, size_t ss, void *opt_data, size_t opt_dlen); + size_t ss, void *opt_data, size_t opt_dlen); #define schedThreadSelf(x) schedThread(TASK_ROOT((x)), TASK_FUNC((x)), TASK_ARG((x)), \ - (TASK_FLAG((x)) & 0x1), (size_t) (TASK_FLAG((x)) >> 1), TASK_DATA((x)), TASK_DATLEN((x))) + (size_t) TASK_FLAG((x)), TASK_DATA((x)), TASK_DATLEN((x))) /* * sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks *