--- libaitsched/src/aitsched.c 2012/01/24 14:04:58 1.4.2.4 +++ libaitsched/src/aitsched.c 2013/10/21 13:40:31 1.19.12.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.4.2.4 2012/01/24 14:04:58 misho Exp $ +* $Id: aitsched.c,v 1.19.12.2 2013/10/21 13:40:31 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -56,21 +56,21 @@ char sched_Error[STRSIZ]; // sched_GetErrno() Get error code of last operation -inline int +int sched_GetErrno() { return sched_Errno; } // sched_GetError() Get error text of last operation -inline const char * +const char * sched_GetError() { return sched_Error; } // sched_SetErr() Set error to variables for internal use!!! -inline void +void sched_SetErr(int eno, char *estr, ...) { va_list lst; @@ -86,14 +86,14 @@ sched_SetErr(int eno, char *estr, ...) /* * schedRegisterHooks() - Register IO handles and bind tasks to it + * * @root = root task * return: -1 error or 0 ok */ int schedRegisterHooks(sched_root_task_t * __restrict root) { - if (!root || (root->root_data.iov_base && root->root_data.iov_len)) - return -1; + assert(root); if (root->root_hooks.hook_root.fini) root->root_hooks.hook_root.fini(root, NULL); @@ -101,6 +101,19 @@ 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; +#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) + root->root_hooks.hook_add.rtc = sched_hook_rtc; +#endif + root->root_hooks.hook_add.node = sched_hook_node; + root->root_hooks.hook_add.proc = sched_hook_proc; + root->root_hooks.hook_add.signal = sched_hook_signal; +#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; @@ -113,6 +126,7 @@ schedRegisterHooks(sched_root_task_t * __restrict root /* * schedInit() - Init scheduler + * * @data = optional data if !=NULL * @datlen = data len if data is set * return: allocated root task if ok or NULL error @@ -132,9 +146,15 @@ 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); + #ifdef HAVE_LIBPTHREAD for (i = 0; i < taskMAX; i++) - if (pthread_mutex_init(&root->root_mtx[i], NULL)) { + if ((errno = pthread_mutex_init(&root->root_mtx[i], NULL))) { LOGERR; while (i) pthread_mutex_destroy(&root->root_mtx[--i]); @@ -149,10 +169,20 @@ schedInit(void ** __restrict data, size_t datlen) TAILQ_INIT(&root->root_read); TAILQ_INIT(&root->root_write); TAILQ_INIT(&root->root_timer); + TAILQ_INIT(&root->root_alarm); + TAILQ_INIT(&root->root_rtc); + TAILQ_INIT(&root->root_node); + 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++) @@ -179,13 +209,14 @@ schedInit(void ** __restrict data, size_t datlen) /* * schedEnd() - End scheduler & free all resources + * * @root = root task * return: -1 error or 0 ok */ int schedEnd(sched_root_task_t ** __restrict root) { - sched_task_t *task; + sched_task_t *task, *tmp; #ifdef HAVE_LIBPTHREAD register int i; #endif @@ -193,29 +224,43 @@ schedEnd(sched_root_task_t ** __restrict root) if (!root || !*root) return -1; - TAILQ_FOREACH(task, &(*root)->root_read, task_node) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_read, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH(task, &(*root)->root_write, task_node) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH(task, &(*root)->root_timer, task_node) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH(task, &(*root)->root_event, task_node) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_alarm, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH(task, &(*root)->root_eventlo, task_node) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_rtc, task_node, tmp) schedCancel(task); - } - TAILQ_FOREACH(task, &(*root)->root_ready, task_node) { + TAILQ_FOREACH_SAFE(task, &(*root)->root_node, task_node, tmp) schedCancel(task); - } + TAILQ_FOREACH_SAFE(task, &(*root)->root_proc, task_node, tmp) + schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_signal, task_node, tmp) + 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_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); + TAILQ_FOREACH_SAFE(task, &(*root)->root_task, 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); } @@ -238,10 +283,11 @@ schedEnd(sched_root_task_t ** __restrict root) /* * schedCall() - Call task execution function + * * @task = current task * return: !=NULL error or =NULL ok */ -inline void * +void * schedCall(sched_task_t * __restrict task) { void *ptr = (void*) -1; @@ -252,7 +298,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); @@ -261,10 +306,11 @@ schedCall(sched_task_t * __restrict task) /* * schedFetch() - Fetch ready task + * * @root = root task * return: =NULL error or !=NULL ready task */ -inline void * +void * schedFetch(sched_root_task_t * __restrict root) { void *ptr; @@ -281,7 +327,267 @@ 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) +{ +#ifndef EVFILT_USER + sched_SetErr(ENOTSUP, "Not supported kevent() filter"); + return -1; +#else + 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; +#endif +} + +/* + * schedQuery() - Query task in scheduler + * + * @task = task + * return: -1 error, 0 found and 1 not found + */ +int +schedQuery(sched_task_t * __restrict task) +{ + sched_queue_t *queue; + sched_task_t *t; + + if (!task || !TASK_ROOT(task)) + return -1; /* error */ + + switch (TASK_TYPE(task)) { + case taskREAD: + queue = &TASK_ROOT(task)->root_read; + break; + 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 taskRTC: + queue = &TASK_ROOT(task)->root_rtc; + break; + case taskNODE: + queue = &TASK_ROOT(task)->root_node; + break; + case taskPROC: + queue = &TASK_ROOT(task)->root_proc; + break; + case taskSIGNAL: + queue = &TASK_ROOT(task)->root_signal; + break; + 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 taskTASK: + queue = &TASK_ROOT(task)->root_task; + break; + case taskSUSPEND: + queue = &TASK_ROOT(task)->root_suspend; + break; + case taskREADY: + queue = &TASK_ROOT(task)->root_ready; + break; + case taskTHREAD: + queue = &TASK_ROOT(task)->root_thread; + break; + default: + return 1; /* not in queue */ + } + if (queue) + TAILQ_FOREACH(t, queue, task_node) + if (TASK_ID(t) == TASK_ID(task)) + return 0; /* found */ + + return 1; /* not in queue */ +} + +/* + * schedQueryby() - Query task in scheduler by criteria + * + * @root = root task + * @type = query from queue type, if =taskMAX query same task from all queues + * @criteria = find task by criteria + * [ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL| + * CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA ] + * @param = search parameter + * return: -1 error, 0 found or 1 not found + */ +int +schedQueryby(sched_root_task_t * __restrict root, sched_task_type_t type, + u_char criteria, void *param) +{ + sched_task_t *task; + sched_queue_t *queue; + register int flg = 0; + + if (!root) + return -1; + /* if type == taskMAX check in all queues */ + if (type == taskMAX) { + if ((flg = schedQueryby(root, taskREAD, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskWRITE, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskTIMER, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskALARM, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskRTC, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskNODE, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskPROC, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskSIGNAL, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskAIO, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskLIO, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskUSER, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskEVENT, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskTASK, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskSUSPEND, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskREADY, criteria, param)) < 1) + return flg; + if ((flg = schedQueryby(root, taskTHREAD, criteria, param)) < 1) + return flg; + return 1; /* not found */ + } + /* choosen queue */ + switch (type) { + case taskREAD: + queue = &root->root_read; + break; + case taskWRITE: + queue = &root->root_write; + break; + case taskTIMER: + queue = &root->root_timer; + break; + case taskALARM: + queue = &root->root_alarm; + break; + case taskRTC: + queue = &root->root_rtc; + break; + case taskNODE: + queue = &root->root_node; + break; + case taskPROC: + queue = &root->root_proc; + break; + case taskSIGNAL: + queue = &root->root_signal; + break; + 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 taskTASK: + queue = &root->root_task; + break; + case taskSUSPEND: + queue = &root->root_suspend; + break; + case taskREADY: + queue = &root->root_ready; + break; + case taskTHREAD: + queue = &root->root_thread; + break; + default: + return 1; /* not found */ + } + + TAILQ_FOREACH(task, queue, task_node) { + switch (criteria) { + case CRITERIA_ANY: + return 0; /* found */ + case CRITERIA_CALL: + if (TASK_FUNC(task) == (sched_task_func_t) param) + return 0; /* found */ + break; + case CRITERIA_ARG: + if (TASK_ARG(task) == param) + return 0; /* found */ + break; + case CRITERIA_FD: + if (TASK_FD(task) == (intptr_t) param) + return 0; /* found */ + break; + case CRITERIA_ID: + case CRITERIA_VAL: + if (TASK_VAL(task) == (u_long) param) + return 0; /* found */ + break; + case CRITERIA_TS: + if (!sched_timespeccmp(&TASK_TS(task), + (struct timespec*) param, -)) + return 0; /* found */ + break; + case CRITERIA_DATA: + if (TASK_DATA(task) == param) + return 0; /* found */ + break; + default: + sched_SetErr(EINVAL, "Invalid parameter criteria %d", + criteria); + return 1; /* not found */ + } + } + + return 1; /* not found */ +} + +/* * schedCancel() - Cancel task from scheduler + * * @task = task * return: -1 error or 0 ok */ @@ -307,15 +613,45 @@ schedCancel(sched_task_t * __restrict task) case taskTIMER: queue = &TASK_ROOT(task)->root_timer; break; + case taskALARM: + queue = &TASK_ROOT(task)->root_alarm; + break; + case taskRTC: + queue = &TASK_ROOT(task)->root_rtc; + break; + case taskNODE: + queue = &TASK_ROOT(task)->root_node; + break; + case taskPROC: + queue = &TASK_ROOT(task)->root_proc; + break; + case taskSIGNAL: + queue = &TASK_ROOT(task)->root_signal; + break; + 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; + break; case taskREADY: queue = &TASK_ROOT(task)->root_ready; break; + case taskTHREAD: + queue = &TASK_ROOT(task)->root_thread; + break; default: queue = NULL; } @@ -323,22 +659,25 @@ 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 } if (TASK_TYPE(task) != taskUNUSE) - _sched_unuseTask(task); + sched_unuseTask(task); return 0; } /* * schedCancelby() - Cancel task from scheduler by criteria + * * @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_TV] + * @criteria = find task by criteria + * [ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL| + * CRITERIA_ID|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 @@ -347,12 +686,13 @@ int schedCancelby(sched_root_task_t * __restrict root, sched_task_type_t type, u_char criteria, void *param, sched_hook_func_t hook) { - sched_task_t *task; + sched_task_t *task, *tmp; sched_queue_t *queue; - int flg = 0; + register int flg = 0; if (!root) return -1; + /* if type == taskMAX check in all queues */ if (type == taskMAX) { if (schedCancelby(root, taskREAD, criteria, param, hook)) return -2; @@ -360,14 +700,35 @@ schedCancelby(sched_root_task_t * __restrict root, sch return -2; if (schedCancelby(root, taskTIMER, criteria, param, hook)) return -2; + if (schedCancelby(root, taskALARM, criteria, param, hook)) + return -2; + if (schedCancelby(root, taskRTC, criteria, param, hook)) + return -2; + if (schedCancelby(root, taskNODE, criteria, param, hook)) + return -2; + if (schedCancelby(root, taskPROC, criteria, param, hook)) + return -2; + if (schedCancelby(root, taskSIGNAL, criteria, param, hook)) + 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 */ switch (type) { case taskREAD: queue = &root->root_read; @@ -378,15 +739,45 @@ schedCancelby(sched_root_task_t * __restrict root, sch case taskTIMER: queue = &root->root_timer; break; + case taskALARM: + queue = &root->root_alarm; + break; + case taskRTC: + queue = &root->root_rtc; + break; + case taskNODE: + queue = &root->root_node; + break; + case taskPROC: + queue = &root->root_proc; + break; + case taskSIGNAL: + queue = &root->root_signal; + break; + 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; + break; case taskREADY: queue = &root->root_ready; break; + case taskTHREAD: + queue = &root->root_thread; + break; default: return 0; } @@ -394,73 +785,79 @@ schedCancelby(sched_root_task_t * __restrict root, sch #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&root->root_mtx[type]); #endif - TAILQ_FOREACH(task, queue, task_node) - if (criteria == CRITERIA_CALL) { - if (task->task_func == (sched_task_func_t) param) { - flg++; + TAILQ_FOREACH_SAFE(task, queue, task_node, tmp) { + flg ^= flg; + switch (criteria) { + case CRITERIA_ANY: + flg = 1; break; - } - } else if (criteria == CRITERIA_ARG) { - if (task->task_arg == param) { - flg++; + case CRITERIA_CALL: + if (TASK_FUNC(task) == (sched_task_func_t) param) + flg = 1; break; - } - } else if (criteria == CRITERIA_FD) { - if (TASK_FD(task) == (intptr_t) param) { - flg++; + case CRITERIA_ARG: + if (TASK_ARG(task) == param) + flg = 1; break; - } - } else if (criteria == CRITERIA_VAL) { - if (TASK_VAL(task) == (u_long) param) { - flg++; + case CRITERIA_FD: + if (TASK_FD(task) == (intptr_t) param) + flg = 1; break; - } - } else if (criteria == CRITERIA_TV) { - if (!timespeccmp(&TASK_TS(task), (struct timespec*) param, -)) { - flg++; + case CRITERIA_ID: + case CRITERIA_VAL: + if (TASK_VAL(task) == (u_long) param) + flg = 1; break; - } - } else { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[type]); -#endif - sched_SetErr(EINVAL, "Invalid parameter criteria %d", criteria); - return -1; + case CRITERIA_TS: + 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; } -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[type]); -#endif - if (!flg || !task) /* task not found */ - return 0; + if (flg < 0) /* error */ + break; + /* cancel choosen task */ + if (flg > 0) { + if (TASK_ROOT(task)->root_hooks.hook_exec.cancel) + if (TASK_ROOT(task)->root_hooks.hook_exec.cancel(task, NULL)) { + flg = -1; + break; + } + /* custom hook */ + if (hook) + if (hook(task, NULL)) { + flg = -3; + break; + } - if (TASK_ROOT(task)->root_hooks.hook_exec.cancel) - if (TASK_ROOT(task)->root_hooks.hook_exec.cancel(task, NULL)) - return -1; - if (hook) - if (hook(task, NULL)) - return -3; + TAILQ_REMOVE(queue, task, task_node); + if (TASK_TYPE(task) != taskUNUSE) + sched_unuseTask(task); + flg ^= flg; /* ok */ + } + } #ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&TASK_ROOT(task)->root_mtx[type]); + pthread_mutex_unlock(&root->root_mtx[type]); #endif - TAILQ_REMOVE(queue, task, task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[type]); -#endif - - if (TASK_TYPE(task) != taskUNUSE) - _sched_unuseTask(task); - return 0; + return flg; } /* * schedRun() - Scheduler *run loop* + * * @root = root task * @killState = kill condition variable, if !=0 stop scheduler loop * return: -1 error or 0 ok */ int -schedRun(sched_root_task_t * __restrict root, volatile intptr_t * __restrict killState) +schedRun(sched_root_task_t *root, volatile intptr_t * __restrict killState) { sched_task_t *task; @@ -470,16 +867,141 @@ schedRun(sched_root_task_t * __restrict root, volatile if (root->root_hooks.hook_exec.run) if (root->root_hooks.hook_exec.run(root, NULL)) return -1; - if (root->root_hooks.hook_exec.fetch) { - if (killState) - while (!*killState) { + + if (killState) { + if (root->root_hooks.hook_exec.condition) + /* condition scheduler loop */ + while (root && root->root_hooks.hook_exec.fetch && + root->root_hooks.hook_exec.condition && + root->root_hooks.hook_exec.condition(root, (void*) killState)) { if ((task = root->root_hooks.hook_exec.fetch(root, NULL))) - schedCall(task); + root->root_ret = schedCall(task); } else - while ((task = root->root_hooks.hook_exec.fetch(root, NULL))) - schedCall(task); - } + /* trigger scheduler loop */ + while (!*killState && root && root->root_hooks.hook_exec.fetch) { + if ((task = root->root_hooks.hook_exec.fetch(root, NULL))) + root->root_ret = schedCall(task); + } + } else + /* infinite scheduler loop */ + while (root && root->root_hooks.hook_exec.fetch) + if ((task = root->root_hooks.hook_exec.fetch(root, NULL))) + root->root_ret = schedCall(task); return 0; +} + +/* + * schedPolling() - Polling timeout period if no timer task is present + * + * @root = root task + * @ts = timeout polling period, if ==NULL INFINIT timeout + * @tsold = old timeout polling if !=NULL + * return: -1 error or 0 ok + */ +int +schedPolling(sched_root_task_t * __restrict root, struct timespec * __restrict ts, + struct timespec * __restrict tsold) +{ + if (!root) + return -1; + + if (tsold) + *tsold = root->root_poll; + + if (!ts) + sched_timespecinf(&root->root_poll); + else + root->root_poll = *ts; + + return 0; +} + +/* + * schedTermCondition() - Activate hook for scheduler condition kill + * + * @root = root task + * @condValue = condition value, kill schedRun() if condValue == killState + * return: -1 error or 0 ok + */ +int +schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue) +{ + if (!root) + return -1; + + root->root_cond = condValue; + root->root_hooks.hook_exec.condition = sched_hook_condition; + return 0; +} + +/* + * schedResumeby() - Resume suspended task + * + * @root = root task + * @criteria = find task by criteria + * [CRITERIA_ANY|CRITERIA_ID|CRITERIA_DATA] + * @param = search parameter (sched_task_t *task| unsigned long id) + * return: -1 error or 0 resumed ok + */ +int +schedResumeby(sched_root_task_t * __restrict root, u_char criteria, void *param) +{ + sched_task_t *task, *tmp; + register int flg = 0; + + if (!root) + return -1; + +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskSUSPEND]); +#endif + TAILQ_FOREACH_SAFE(task, &root->root_suspend, task_node, tmp) { + flg ^= flg; + switch (criteria) { + case CRITERIA_ANY: + flg = 1; + break; + case CRITERIA_ID: + if (TASK_VAL(task) == (u_long) param) + flg = 1; + break; + case CRITERIA_DATA: + if (TASK_ID(task) == (sched_task_t*) param) + flg = 1; + break; + default: + sched_SetErr(EINVAL, "Invalid parameter criteria %d", criteria); + flg = -1; + } + if (flg < 0) + break; + /* resume choosen task */ + if (flg > 0) { + if (root->root_hooks.hook_exec.resume) + if (root->root_hooks.hook_exec.resume(task, NULL)) { + flg = -1; + break; + } + + TAILQ_REMOVE(&root->root_suspend, task, task_node); + + task->task_type = taskREADY; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&root->root_mtx[taskREADY]); +#endif + TAILQ_INSERT_TAIL(&root->root_ready, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskREADY]); +#endif + + flg ^= flg; /* ok */ + } + } +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]); +#endif + + return flg; }