--- libaitsched/src/aitsched.c 2012/05/30 08:52:45 1.9 +++ libaitsched/src/aitsched.c 2012/05/31 21:36:40 1.9.2.2 @@ -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.2 2012/05/31 21:36:40 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); @@ -200,32 +208,33 @@ schedEnd(sched_root_task_t ** __restrict root) if (!root || !*root) return -1; - TAILQ_FOREACH_SAFE(task, &(*root)->root_read, task_node, tmp) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_read, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH_SAFE(task, &(*root)->root_alarm, task_node, tmp) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_alarm, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_node, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, task_node, tmp) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_proc, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp) { + 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); + TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, task_node, tmp) + schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp) + schedCancel(task); #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]); #endif - while ((task = TAILQ_FIRST(&(*root)->root_unuse))) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_unuse, task_node, tmp) { TAILQ_REMOVE(&(*root)->root_unuse, task, task_node); free(task); } @@ -263,7 +272,6 @@ schedCall(sched_task_t * __restrict task) if (!TASK_ISLOCKED(task)) TASK_LOCK(task); - task->task_id++; ptr = task->task_func(task); TASK_UNLOCK(task); @@ -293,6 +301,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 +353,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; @@ -339,7 +387,7 @@ schedCancel(sched_task_t * __restrict task) #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&TASK_ROOT(task)->root_mtx[TASK_TYPE(task)]); #endif - TAILQ_REMOVE(queue, task, task_node); + TAILQ_REMOVE(queue, TASK_ID(task), task_node); #ifdef HAVE_LIBPTHREAD pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[TASK_TYPE(task)]); #endif @@ -355,7 +403,8 @@ 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_ANY|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 @@ -370,15 +419,24 @@ schedCancelby(sched_root_task_t * __restrict root, sch if (!root) return -1; + /* if type == taskMAX check in all queues */ if (type == taskMAX) { if (schedCancelby(root, taskREAD, criteria, param, hook)) 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)) @@ -387,6 +445,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch return -2; return 0; } + /* choosen queue */ switch (type) { case taskREAD: queue = &root->root_read; @@ -394,12 +453,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; @@ -419,6 +490,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch TAILQ_FOREACH_SAFE(task, queue, task_node, tmp) { flg ^= flg; switch (criteria) { + case CRITERIA_ANY: + flg = 1; + break; case CRITERIA_CALL: if (TASK_FUNC(task) == (sched_task_func_t) param) flg = 1; @@ -439,11 +513,15 @@ schedCancelby(sched_root_task_t * __restrict root, sch if (!sched_timespeccmp(&TASK_TS(task), (struct timespec*) param, -)) flg = 1; break; + case CRITERIA_DATA: + if (TASK_DATA(task) == param) + flg = 1; + break; default: sched_SetErr(EINVAL, "Invalid parameter criteria %d", criteria); flg = -1; } - if (flg < 0) + if (flg < 0) /* error */ break; /* cancel choosen task */ if (flg > 0) {