--- libaitsched/src/aitsched.c 2012/08/01 12:49:26 1.11.2.2 +++ libaitsched/src/aitsched.c 2012/08/22 10:33:45 1.15.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.15.2.1 2012/08/22 10:33:45 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -108,6 +108,9 @@ schedRegisterHooks(sched_root_task_t * __restrict root #ifdef EVFILT_USER root->root_hooks.hook_add.user = sched_hook_user; #endif +#ifdef HAVE_LIBPTHREAD + root->root_hooks.hook_add.thread = sched_hook_thread; +#endif root->root_hooks.hook_exec.cancel = sched_hook_cancel; root->root_hooks.hook_exec.fetch = sched_hook_fetch; @@ -140,6 +143,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 +171,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++) @@ -207,6 +215,7 @@ schedEnd(sched_root_task_t ** __restrict root) sched_task_t *task, *tmp; #ifdef HAVE_LIBPTHREAD register int i; + pthread_t tid; #endif if (!root || !*root) @@ -228,16 +237,26 @@ 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) - 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) { + tid = (pthread_t) TASK_VAL(task); + schedCancel(task); +#ifdef HAVE_LIBPTHREAD + if (TASK_FLAG(task) == PTHREAD_CREATE_JOINABLE) + pthread_join(tid, NULL); +#endif + } + TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp) + schedCancel(task); #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]); @@ -384,14 +403,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 +421,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; } @@ -412,7 +437,7 @@ schedCancel(sched_task_t * __restrict task) #endif } if (TASK_TYPE(task) != taskUNUSE) - _sched_unuseTask(task); + sched_unuseTask(task); return 0; } @@ -456,16 +481,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 +523,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 +541,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; } @@ -569,7 +604,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch TAILQ_REMOVE(queue, task, task_node); if (TASK_TYPE(task) != taskUNUSE) - _sched_unuseTask(task); + sched_unuseTask(task); flg ^= flg; /* ok */ } @@ -654,7 +689,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)