--- libaitsched/src/aitsched.c 2012/08/01 12:49:26 1.11.2.2 +++ 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.11.2.2 2012/08/01 12:49:26 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 @@ -140,6 +140,9 @@ schedInit(void ** __restrict data, size_t datlen) } else { memset(root, 0, sizeof(sched_root_task_t)); + /* set default maximum regular task hit misses */ + root->root_miss = MAX_TASK_MISS; + /* INFINIT polling period by default */ sched_timespecinf(&root->root_poll); @@ -165,12 +168,14 @@ schedInit(void ** __restrict data, size_t datlen) TAILQ_INIT(&root->root_proc); 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_task); 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++) @@ -228,16 +233,20 @@ schedEnd(sched_root_task_t ** __restrict root) 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) + TAILQ_FOREACH_SAFE(task, &(*root)->root_task, 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); + TAILQ_FOREACH_SAFE(task, &(*root)->root_thread, task_node, tmp) + schedCancel(task); #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]); @@ -384,14 +393,17 @@ schedCancel(sched_task_t * __restrict task) 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; + case taskTASK: + queue = &TASK_ROOT(task)->root_task; break; case taskSUSPEND: queue = &TASK_ROOT(task)->root_suspend; @@ -399,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; } @@ -456,16 +471,20 @@ schedCancelby(sched_root_task_t * __restrict root, sch 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)) + if (schedCancelby(root, taskTASK, criteria, param, hook)) return -2; if (schedCancelby(root, taskSUSPEND, criteria, param, hook)) return -2; if (schedCancelby(root, taskREADY, criteria, param, hook)) return -2; + if (schedCancelby(root, taskTHREAD, criteria, param, hook)) + return -2; return 0; } /* choosen queue */ @@ -494,14 +513,17 @@ schedCancelby(sched_root_task_t * __restrict root, sch 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; + case taskTASK: + queue = &root->root_task; break; case taskSUSPEND: queue = &root->root_suspend; @@ -509,6 +531,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch case taskREADY: queue = &root->root_ready; break; + case taskTHREAD: + queue = &root->root_thread; + break; default: return 0; } @@ -654,7 +679,7 @@ schedPolling(sched_root_task_t * __restrict root, stru * * @root = root task * @condValue = condition value, kill schedRun() if condValue == killState - * return: -1 error ok 0 ok + * return: -1 error or 0 ok */ inline int schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue)