--- libaitsched/src/aitsched.c 2012/05/31 21:51:29 1.9.2.4 +++ libaitsched/src/aitsched.c 2012/08/02 13:45:02 1.11.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.9.2.4 2012/05/31 21:51:29 misho Exp $ +* $Id: aitsched.c,v 1.11.2.3 2012/08/02 13:45:02 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -163,10 +163,13 @@ schedInit(void ** __restrict data, size_t datlen) TAILQ_INIT(&root->root_alarm); TAILQ_INIT(&root->root_node); TAILQ_INIT(&root->root_proc); - TAILQ_INIT(&root->root_user); TAILQ_INIT(&root->root_signal); + TAILQ_INIT(&root->root_aio); + TAILQ_INIT(&root->root_lio); + TAILQ_INIT(&root->root_user); TAILQ_INIT(&root->root_event); TAILQ_INIT(&root->root_eventlo); + TAILQ_INIT(&root->root_suspend); TAILQ_INIT(&root->root_ready); TAILQ_INIT(&root->root_unuse); @@ -222,14 +225,20 @@ schedEnd(sched_root_task_t ** __restrict root) schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_proc, task_node, tmp) schedCancel(task); - TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp) - schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_signal, task_node, tmp) schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_aio, task_node, tmp) + schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_lio, task_node, tmp) + schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp) + schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp) schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, task_node, tmp) schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_suspend, task_node, tmp) + schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp) schedCancel(task); @@ -372,18 +381,27 @@ schedCancel(sched_task_t * __restrict task) case taskPROC: queue = &TASK_ROOT(task)->root_proc; break; - case taskUSER: - queue = &TASK_ROOT(task)->root_user; - 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 taskEVENTLO: queue = &TASK_ROOT(task)->root_eventlo; break; + case taskSUSPEND: + queue = &TASK_ROOT(task)->root_suspend; + break; case taskREADY: queue = &TASK_ROOT(task)->root_ready; break; @@ -411,7 +429,7 @@ 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_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 @@ -440,14 +458,20 @@ schedCancelby(sched_root_task_t * __restrict root, sch return -2; if (schedCancelby(root, taskPROC, criteria, param, hook)) return -2; - if (schedCancelby(root, taskUSER, criteria, param, hook)) - return -2; if (schedCancelby(root, taskSIGNAL, criteria, param, hook)) return -2; + if (schedCancelby(root, taskAIO, criteria, param, hook)) + return -2; + if (schedCancelby(root, taskLIO, criteria, param, hook)) + return -2; + if (schedCancelby(root, taskUSER, criteria, param, hook)) + return -2; if (schedCancelby(root, taskEVENT, criteria, param, hook)) return -2; if (schedCancelby(root, taskEVENTLO, criteria, param, hook)) return -2; + if (schedCancelby(root, taskSUSPEND, criteria, param, hook)) + return -2; if (schedCancelby(root, taskREADY, criteria, param, hook)) return -2; return 0; @@ -472,18 +496,27 @@ schedCancelby(sched_root_task_t * __restrict root, sch case taskPROC: queue = &root->root_proc; break; - case taskUSER: - queue = &root->root_user; - 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 taskEVENTLO: queue = &root->root_eventlo; break; + case taskSUSPEND: + queue = &root->root_suspend; + break; case taskREADY: queue = &root->root_ready; break; @@ -512,6 +545,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch if (TASK_FD(task) == (intptr_t) param) flg = 1; break; + case CRITERIA_ID: case CRITERIA_VAL: if (TASK_VAL(task) == (u_long) param) flg = 1; @@ -583,19 +617,19 @@ schedRun(sched_root_task_t *root, volatile intptr_t * root->root_hooks.hook_exec.condition && root->root_hooks.hook_exec.condition(root, (void*) killState)) { if ((task = root->root_hooks.hook_exec.fetch(root, NULL))) - schedCall(task); + root->root_ret = schedCall(task); } else /* trigger scheduler loop */ while (!*killState && root && root->root_hooks.hook_exec.fetch) { if ((task = root->root_hooks.hook_exec.fetch(root, NULL))) - schedCall(task); + root->root_ret = schedCall(task); } } else /* infinite scheduler loop */ while (root && root->root_hooks.hook_exec.fetch) if ((task = root->root_hooks.hook_exec.fetch(root, NULL))) - schedCall(task); + root->root_ret = schedCall(task); return 0; } @@ -642,4 +676,74 @@ schedTermCondition(sched_root_task_t * __restrict root root->root_cond = condValue; root->root_hooks.hook_exec.condition = sched_hook_condition; return 0; +} + +/* + * schedResumeby() - Resume suspended task + * + * @root = root task + * @criteria = find task by criteria + * [CRITERIA_ANY|CRITERIA_ID|CRITERIA_DATA] + * @param = search parameter (sched_task_t *task| u_long id) + * return: -1 error or 0 resumed ok + */ +int +schedResumeby(sched_root_task_t * __restrict root, u_char criteria, void *param) +{ + sched_task_t *task, *tmp; + register int flg = 0; + + if (!root) + return -1; + +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskSUSPEND]); +#endif + TAILQ_FOREACH_SAFE(task, &root->root_suspend, task_node, tmp) { + flg ^= flg; + switch (criteria) { + case CRITERIA_ANY: + flg = 1; + break; + case CRITERIA_ID: + if (TASK_VAL(task) == (u_long) param) + flg = 1; + break; + case CRITERIA_DATA: + if (TASK_ID(task) == (sched_task_t*) param) + flg = 1; + break; + default: + sched_SetErr(EINVAL, "Invalid parameter criteria %d", criteria); + flg = -1; + } + if (flg < 0) + break; + /* resume choosen task */ + if (flg > 0) { + if (root->root_hooks.hook_exec.resume) + if (root->root_hooks.hook_exec.resume(task, NULL)) { + flg = -1; + break; + } + + TAILQ_REMOVE(&root->root_suspend, task, task_node); + + task->task_type = taskREADY; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskREADY]); +#endif + TAILQ_INSERT_TAIL(&root->root_ready, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskREADY]); +#endif + + flg ^= flg; /* ok */ + } + } +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]); +#endif + + return flg; }