--- libaitsched/src/aitsched.c 2012/05/30 08:52:45 1.9 +++ libaitsched/src/aitsched.c 2012/05/31 14:17:59 1.9.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.9 2012/05/30 08:52:45 misho Exp $ +* $Id: aitsched.c,v 1.9.2.1 2012/05/31 14:17:59 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -102,6 +102,10 @@ schedRegisterHooks(sched_root_task_t * __restrict root root->root_hooks.hook_add.read = sched_hook_read; root->root_hooks.hook_add.write = sched_hook_write; root->root_hooks.hook_add.alarm = sched_hook_alarm; + root->root_hooks.hook_add.node = sched_hook_node; + root->root_hooks.hook_add.proc = sched_hook_proc; + root->root_hooks.hook_add.user = sched_hook_user; + root->root_hooks.hook_add.signal = sched_hook_signal; root->root_hooks.hook_exec.cancel = sched_hook_cancel; root->root_hooks.hook_exec.fetch = sched_hook_fetch; @@ -153,8 +157,12 @@ schedInit(void ** __restrict data, size_t datlen) TAILQ_INIT(&root->root_read); TAILQ_INIT(&root->root_write); - TAILQ_INIT(&root->root_alarm); TAILQ_INIT(&root->root_timer); + 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_event); TAILQ_INIT(&root->root_eventlo); TAILQ_INIT(&root->root_ready); @@ -206,12 +214,24 @@ schedEnd(sched_root_task_t ** __restrict root) TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp) { schedCancel(task); } + TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) { + schedCancel(task); + } TAILQ_FOREACH_SAFE(task, &(*root)->root_alarm, task_node, tmp) { schedCancel(task); } - TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_node, task_node, tmp) { 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_event, task_node, tmp) { schedCancel(task); } @@ -293,6 +313,34 @@ schedFetch(sched_root_task_t * __restrict root) } /* + * schedTrigger() - Triggering USER task + * + * @task = task + * return: -1 error or 0 ok + */ +int +schedTrigger(sched_task_t * __restrict task) +{ + struct kevent chg[1]; + struct timespec timeout = { 0, 0 }; + + if (!task || !TASK_ROOT(task)) + return -1; + +#ifdef __NetBSD__ + EV_SET(chg, TASK_VAL(task), EVFILT_USER, 0, NOTE_TRIGGER, 0, (intptr_t) TASK_VAL(task)); +#else + EV_SET(chg, TASK_VAL(task), EVFILT_USER, 0, NOTE_TRIGGER, 0, (void*) TASK_VAL(task)); +#endif + if (kevent(TASK_ROOT(task)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { + LOGERR; + return -1; + } + + return 0; +} + +/* * schedCancel() - Cancel task from scheduler * * @task = task @@ -317,12 +365,24 @@ schedCancel(sched_task_t * __restrict task) 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 taskTIMER: - queue = &TASK_ROOT(task)->root_timer; + case taskNODE: + queue = &TASK_ROOT(task)->root_node; break; + 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 taskEVENT: queue = &TASK_ROOT(task)->root_event; break; @@ -355,7 +415,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_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_TS] + * @criteria = find task by criteria [CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|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 @@ -375,10 +435,18 @@ schedCancelby(sched_root_task_t * __restrict root, sch return -2; if (schedCancelby(root, taskWRITE, criteria, param, hook)) return -2; + if (schedCancelby(root, taskTIMER, criteria, param, hook)) + return -2; if (schedCancelby(root, taskALARM, criteria, param, hook)) return -2; - if (schedCancelby(root, taskTIMER, criteria, param, hook)) + if (schedCancelby(root, taskNODE, criteria, param, hook)) 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, taskEVENT, criteria, param, hook)) return -2; if (schedCancelby(root, taskEVENTLO, criteria, param, hook)) @@ -394,12 +462,24 @@ schedCancelby(sched_root_task_t * __restrict root, sch case taskWRITE: queue = &root->root_write; break; + case taskTIMER: + queue = &root->root_timer; + break; case taskALARM: queue = &root->root_alarm; break; - case taskTIMER: - queue = &root->root_timer; + case taskNODE: + queue = &root->root_node; break; + case taskPROC: + queue = &root->root_proc; + break; + case taskUSER: + queue = &root->root_user; + break; + case taskSIGNAL: + queue = &root->root_signal; + break; case taskEVENT: queue = &root->root_event; break; @@ -437,6 +517,10 @@ schedCancelby(sched_root_task_t * __restrict root, sch break; case CRITERIA_TS: if (!sched_timespeccmp(&TASK_TS(task), (struct timespec*) param, -)) + flg = 1; + break; + case CRITERIA_DATA: + if (TASK_DATA(task) == param) flg = 1; break; default: