--- libaitsched/src/aitsched.c 2012/05/19 00:46:53 1.8 +++ libaitsched/src/aitsched.c 2012/05/30 08:52:45 1.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.8 2012/05/19 00:46:53 misho Exp $ +* $Id: aitsched.c,v 1.9 2012/05/30 08:52:45 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -101,6 +101,7 @@ 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_exec.cancel = sched_hook_cancel; root->root_hooks.hook_exec.fetch = sched_hook_fetch; @@ -152,6 +153,7 @@ 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_event); TAILQ_INIT(&root->root_eventlo); @@ -204,6 +206,9 @@ 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_alarm, task_node, tmp) { + schedCancel(task); + } TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) { schedCancel(task); } @@ -312,6 +317,9 @@ schedCancel(sched_task_t * __restrict task) case taskWRITE: queue = &TASK_ROOT(task)->root_write; break; + case taskALARM: + queue = &TASK_ROOT(task)->root_alarm; + break; case taskTIMER: queue = &TASK_ROOT(task)->root_timer; break; @@ -367,6 +375,8 @@ schedCancelby(sched_root_task_t * __restrict root, sch return -2; if (schedCancelby(root, taskWRITE, criteria, param, hook)) return -2; + if (schedCancelby(root, taskALARM, criteria, param, hook)) + return -2; if (schedCancelby(root, taskTIMER, criteria, param, hook)) return -2; if (schedCancelby(root, taskEVENT, criteria, param, hook)) @@ -383,6 +393,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch break; case taskWRITE: queue = &root->root_write; + break; + case taskALARM: + queue = &root->root_alarm; break; case taskTIMER: queue = &root->root_timer;