--- libaitsched/src/aitsched.c 2012/08/02 13:56:19 1.12 +++ libaitsched/src/aitsched.c 2013/11/21 14:39:10 1.23 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.12 2012/08/02 13:56:19 misho Exp $ +* $Id: aitsched.c,v 1.23 2013/11/21 14:39:10 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, 2012 +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; @@ -102,12 +102,18 @@ 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; @@ -140,12 +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]); @@ -161,6 +170,7 @@ schedInit(void ** __restrict data, size_t datlen) 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); @@ -168,10 +178,11 @@ schedInit(void ** __restrict data, size_t datlen) 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++) @@ -221,6 +232,8 @@ schedEnd(sched_root_task_t ** __restrict root) schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_alarm, task_node, tmp) schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_rtc, task_node, tmp) + schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_node, task_node, tmp) schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_proc, task_node, tmp) @@ -235,12 +248,14 @@ schedEnd(sched_root_task_t ** __restrict root) 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) + schedCancel(task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp) + schedCancel(task); #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]); @@ -272,7 +287,7 @@ schedEnd(sched_root_task_t ** __restrict root) * @task = current task * return: !=NULL error or =NULL ok */ -inline void * +void * schedCall(sched_task_t * __restrict task) { void *ptr = (void*) -1; @@ -295,7 +310,7 @@ schedCall(sched_task_t * __restrict task) * @root = root task * return: =NULL error or !=NULL ready task */ -inline void * +void * schedFetch(sched_root_task_t * __restrict root) { void *ptr; @@ -345,6 +360,236 @@ schedTrigger(sched_task_t * __restrict task) } /* + * 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|CRITERIA_DATLEN ] + * @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; + case CRITERIA_DATLEN: + if (TASK_DATLEN(task) == (size_t) 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 @@ -375,6 +620,9 @@ schedCancel(sched_task_t * __restrict task) 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; @@ -396,8 +644,8 @@ schedCancel(sched_task_t * __restrict task) 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; @@ -405,6 +653,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; } @@ -418,7 +669,7 @@ schedCancel(sched_task_t * __restrict task) #endif } if (TASK_TYPE(task) != taskUNUSE) - _sched_unuseTask(task); + sched_unuseTask(task); return 0; } @@ -429,7 +680,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_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL|CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA] + * [ CRITERIA_ANY|CRITERIA_CALL|CRITERIA_ARG|CRITERIA_FD|CRITERIA_VAL| + * CRITERIA_ID|CRITERIA_TS|CRITERIA_DATA|CRITERIA_DATLEN ] * @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 @@ -454,6 +706,8 @@ schedCancelby(sched_root_task_t * __restrict root, sch 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)) @@ -468,12 +722,14 @@ schedCancelby(sched_root_task_t * __restrict root, sch 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 */ @@ -490,6 +746,9 @@ schedCancelby(sched_root_task_t * __restrict root, sch case taskALARM: queue = &root->root_alarm; break; + case taskRTC: + queue = &root->root_rtc; + break; case taskNODE: queue = &root->root_node; break; @@ -511,8 +770,8 @@ schedCancelby(sched_root_task_t * __restrict root, sch 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; @@ -520,6 +779,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; } @@ -558,6 +820,10 @@ schedCancelby(sched_root_task_t * __restrict root, sch if (TASK_DATA(task) == param) flg = 1; break; + case CRITERIA_DATLEN: + if (TASK_DATLEN(task) == (size_t) param) + flg = 1; + break; default: sched_SetErr(EINVAL, "Invalid parameter criteria %d", criteria); flg = -1; @@ -580,7 +846,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 */ } @@ -642,7 +908,7 @@ schedRun(sched_root_task_t *root, volatile intptr_t * * @tsold = old timeout polling if !=NULL * return: -1 error or 0 ok */ -inline int +int schedPolling(sched_root_task_t * __restrict root, struct timespec * __restrict ts, struct timespec * __restrict tsold) { @@ -665,9 +931,9 @@ 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 +int schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue) { if (!root) @@ -683,8 +949,8 @@ schedTermCondition(sched_root_task_t * __restrict root * * @root = root task * @criteria = find task by criteria - * [CRITERIA_ANY|CRITERIA_ID|CRITERIA_DATA] - * @param = search parameter (sched_task_t *task| u_long id) + * [CRITERIA_ANY|CRITERIA_ID|CRITERIA_VAL|CRITERIA_DATA] + * @param = search parameter (sched_task_t *task| unsigned long id) * return: -1 error or 0 resumed ok */ int @@ -706,6 +972,7 @@ schedResumeby(sched_root_task_t * __restrict root, u_c flg = 1; break; case CRITERIA_ID: + case CRITERIA_VAL: if (TASK_VAL(task) == (u_long) param) flg = 1; break;