--- libaitsched/src/aitsched.c 2012/08/08 23:04:41 1.14 +++ libaitsched/src/aitsched.c 2012/08/21 11:07:16 1.14.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.14 2012/08/08 23:04:41 misho Exp $ +* $Id: aitsched.c,v 1.14.2.1 2012/08/21 11:07:16 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -175,6 +175,7 @@ schedInit(void ** __restrict data, size_t datlen) TAILQ_INIT(&root->root_suspend); TAILQ_INIT(&root->root_ready); TAILQ_INIT(&root->root_unuse); + TAILQ_INIT(&root->root_thread); #ifdef HAVE_LIBPTHREAD for (i = 0; i < taskMAX; i++) @@ -244,6 +245,8 @@ schedEnd(sched_root_task_t ** __restrict root) schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp) schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_thread, task_node, tmp) + schedCancel(task); #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]); @@ -408,6 +411,9 @@ schedCancel(sched_task_t * __restrict task) case taskREADY: queue = &TASK_ROOT(task)->root_ready; break; + case taskTHREAD: + queue = &TASK_ROOT(task)->root_thread; + break; default: queue = NULL; } @@ -477,6 +483,8 @@ schedCancelby(sched_root_task_t * __restrict root, sch return -2; if (schedCancelby(root, taskREADY, criteria, param, hook)) return -2; + if (schedCancelby(root, taskTHREAD, criteria, param, hook)) + return -2; return 0; } /* choosen queue */ @@ -522,6 +530,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch break; case taskREADY: queue = &root->root_ready; + break; + case taskTHREAD: + queue = &root->root_thread; break; default: return 0;