--- libaitsched/src/aitsched.c 2013/08/15 19:10:48 1.19 +++ libaitsched/src/aitsched.c 2023/02/23 15:39:07 1.30.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.19 2013/08/15 19:10:48 misho Exp $ +* $Id: aitsched.c,v 1.30.2.2 2023/02/23 15:39:07 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, 2013 +Copyright 2004 - 2023 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -82,6 +82,79 @@ sched_SetErr(int eno, char *estr, ...) va_end(lst); } + +/* string support functions directly imported from OpenBSD */ + +#ifndef HAVE_STRLCAT +/* + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ +size_t +strlcat(char * __restrict dst, const char * __restrict src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + size_t dlen; + + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = siz - dlen; + + if (n == 0) + return(dlen + strlen(s)); + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + + return(dlen + (s - src)); /* count does not include NUL */ +} +#endif +#ifndef HAVE_STRLCPY +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +size_t +strlcpy(char * __restrict dst, const char * __restrict src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + + /* Copy as many bytes as will fit */ + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } + } + + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return(s - src - 1); /* count does not include NUL */ +} +#endif + + /* Init and prepare scheduler functions */ /* @@ -101,16 +174,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) +#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) root->root_hooks.hook_add.rtc = sched_hook_rtc; #endif +#if SUP_ENABLE == KQ_SUPPORT + 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.signal = sched_hook_signal; #ifdef EVFILT_USER root->root_hooks.hook_add.user = sched_hook_user; #endif +#endif /* KQ_SUPPORT */ #ifdef HAVE_LIBPTHREAD root->root_hooks.hook_add.thread = sched_hook_thread; #endif @@ -140,7 +215,7 @@ schedInit(void ** __restrict data, size_t datlen) register int i; #endif - root = malloc(sizeof(sched_root_task_t)); + root = e_malloc(sizeof(sched_root_task_t)); if (!root) { LOGERR; } else { @@ -158,7 +233,7 @@ schedInit(void ** __restrict data, size_t datlen) LOGERR; while (i) pthread_mutex_destroy(&root->root_mtx[--i]); - free(root); + e_free(root); return NULL; } @@ -224,7 +299,45 @@ schedEnd(sched_root_task_t ** __restrict root) if (!root || !*root) return -1; +#if 0 TAILQ_FOREACH_SAFE(task, &(*root)->root_read, task_node, tmp) + printf("read=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp) + printf("write=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) + printf("timer=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_alarm, task_node, tmp) + printf("alarm=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_rtc, task_node, tmp) + printf("rtc=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_node, task_node, tmp) + printf("node=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_proc, task_node, tmp) + printf("proc=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_signal, task_node, tmp) + printf("signal=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_aio, task_node, tmp) + printf("aio=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_lio, task_node, tmp) + printf("lio=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp) + printf("user=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp) + printf("event=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_suspend, task_node, tmp) + printf("suspend=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp) + printf("ready=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_thread, task_node, tmp) + printf("thread=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp) + printf("task=%p\n", task); + TAILQ_FOREACH_SAFE(task, &(*root)->root_unuse, task_node, tmp) + printf("unuse=%p\n", task); + fflush(stdout); +#endif + + TAILQ_FOREACH_SAFE(task, &(*root)->root_read, task_node, tmp) schedCancel(task); TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp) schedCancel(task); @@ -257,26 +370,30 @@ schedEnd(sched_root_task_t ** __restrict root) TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp) schedCancel(task); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]); -#endif + SCHED_QLOCK((*root), taskUNUSE); TAILQ_FOREACH_SAFE(task, &(*root)->root_unuse, task_node, tmp) { TAILQ_REMOVE(&(*root)->root_unuse, task, task_node); - free(task); + e_free(task); } -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&(*root)->root_mtx[taskUNUSE]); -#endif + SCHED_QUNLOCK((*root), taskUNUSE); if ((*root)->root_hooks.hook_root.fini) (*root)->root_hooks.hook_root.fini(*root, NULL); #ifdef HAVE_LIBPTHREAD - for (i = 0; i < taskMAX; i++) + for (i = 0; i < taskMAX; i++) { + SCHED_QTRYLOCK(*root, i); + SCHED_QUNLOCK(*root, i); pthread_mutex_destroy(&(*root)->root_mtx[i]); + } + + if ((*root)->root_sigthr) { + pthread_cancel((*root)->root_sigthr); + (*root)->root_sigthr = NULL; + } #endif - free(*root); + e_free(*root); *root = NULL; return 0; } @@ -335,6 +452,10 @@ schedFetch(sched_root_task_t * __restrict root) int schedTrigger(sched_task_t * __restrict task) { +#if SUP_ENABLE != KQ_SUPPORT + sched_SetErr(ENOTSUP, "disabled kqueue support"); + return -1; +#else #ifndef EVFILT_USER sched_SetErr(ENOTSUP, "Not supported kevent() filter"); return -1; @@ -357,9 +478,239 @@ schedTrigger(sched_task_t * __restrict task) return 0; #endif +#endif /* KQ_SUPPORT */ } /* + * 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: NULL not found or !=NULL task + */ +sched_task_t * +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; + + if (!root) + return NULL; + /* if type == taskMAX check in all queues */ + if (type == taskMAX) { + if ((task = schedQueryby(root, taskREAD, criteria, param))) + return task; + if ((task = schedQueryby(root, taskWRITE, criteria, param))) + return task; + if ((task = schedQueryby(root, taskTIMER, criteria, param))) + return task; + if ((task = schedQueryby(root, taskALARM, criteria, param))) + return task; + if ((task = schedQueryby(root, taskRTC, criteria, param))) + return task; + if ((task = schedQueryby(root, taskNODE, criteria, param))) + return task; + if ((task = schedQueryby(root, taskPROC, criteria, param))) + return task; + if ((task = schedQueryby(root, taskSIGNAL, criteria, param))) + return task; + if ((task = schedQueryby(root, taskAIO, criteria, param))) + return task; + if ((task = schedQueryby(root, taskLIO, criteria, param))) + return task; + if ((task = schedQueryby(root, taskUSER, criteria, param))) + return task; + if ((task = schedQueryby(root, taskEVENT, criteria, param))) + return task; + if ((task = schedQueryby(root, taskTASK, criteria, param))) + return task; + if ((task = schedQueryby(root, taskSUSPEND, criteria, param))) + return task; + if ((task = schedQueryby(root, taskREADY, criteria, param))) + return task; + if ((task = schedQueryby(root, taskTHREAD, criteria, param))) + return task; + return NULL; /* 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 NULL; /* not found */ + } + + TAILQ_FOREACH(task, queue, task_node) { + switch (criteria) { + case CRITERIA_ANY: + return task; /* found */ + case CRITERIA_CALL: + if (TASK_FUNC(task) == (sched_task_func_t) param) + return task; /* found */ + break; + case CRITERIA_ARG: + if (TASK_ARG(task) == param) + return task; /* found */ + break; + case CRITERIA_FD: + if (TASK_FD(task) == (intptr_t) param) + return task; /* found */ + break; + case CRITERIA_ID: + case CRITERIA_VAL: + if (TASK_VAL(task) == (u_long) param) + return task; /* found */ + break; + case CRITERIA_TS: + if (!sched_timespeccmp(&TASK_TS(task), + (struct timespec*) param, -)) + return task; /* found */ + break; + case CRITERIA_DATA: + if (TASK_DATA(task) == param) + return task; /* found */ + break; + case CRITERIA_DATLEN: + if (TASK_DATLEN(task) == (size_t) param) + return task; /* found */ + break; + default: + sched_SetErr(EINVAL, "Invalid parameter criteria %d", + criteria); + return NULL; /* not found */ + } + } + + return NULL; /* not found */ +} + +/* * schedCancel() - Cancel task from scheduler * * @task = task @@ -429,15 +780,8 @@ schedCancel(sched_task_t * __restrict task) default: queue = NULL; } - if (queue) { -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&TASK_ROOT(task)->root_mtx[TASK_TYPE(task)]); -#endif - TAILQ_REMOVE(queue, TASK_ID(task), task_node); -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&TASK_ROOT(task)->root_mtx[TASK_TYPE(task)]); -#endif - } + if (queue) + remove_task_from(task, queue); if (TASK_TYPE(task) != taskUNUSE) sched_unuseTask(task); @@ -450,7 +794,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 @@ -555,9 +900,7 @@ schedCancelby(sched_root_task_t * __restrict root, sch return 0; } -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[type]); -#endif + SCHED_QLOCK(root, type); TAILQ_FOREACH_SAFE(task, queue, task_node, tmp) { flg ^= flg; switch (criteria) { @@ -589,6 +932,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; @@ -616,9 +963,8 @@ schedCancelby(sched_root_task_t * __restrict root, sch flg ^= flg; /* ok */ } } -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[type]); -#endif + SCHED_QUNLOCK(root, type); + return flg; } @@ -699,12 +1045,12 @@ schedPolling(sched_root_task_t * __restrict root, stru * return: -1 error or 0 ok */ int -schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue) +schedTermCondition(sched_root_task_t * __restrict root, intptr_t * __restrict condValue) { - if (!root) + if (!root && !condValue) return -1; - root->root_cond = condValue; + *root->root_cond = *condValue; root->root_hooks.hook_exec.condition = sched_hook_condition; return 0; } @@ -714,8 +1060,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 @@ -727,9 +1073,7 @@ schedResumeby(sched_root_task_t * __restrict root, u_c if (!root) return -1; -#ifdef HAVE_LIBPTHREAD - pthread_mutex_lock(&root->root_mtx[taskSUSPEND]); -#endif + SCHED_QLOCK(root, taskSUSPEND); TAILQ_FOREACH_SAFE(task, &root->root_suspend, task_node, tmp) { flg ^= flg; switch (criteria) { @@ -737,6 +1081,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; @@ -761,20 +1106,71 @@ schedResumeby(sched_root_task_t * __restrict root, u_c 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 + insert_task_to(task, &root->root_ready); flg ^= flg; /* ok */ } } -#ifdef HAVE_LIBPTHREAD - pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]); -#endif + SCHED_QUNLOCK(root, taskSUSPEND); return flg; +} + +static void * +_sched_sigDisp(void *arg) +{ + sched_root_task_t *sched = arg; + sigset_t ss; + int sig; + + sigfillset(&ss); + while (sched->root_sigthr) { + sigwait(&ss, &sig); + + } + + return NULL; +} + +/* + * schedSignalDispatch() - Activate or Deactivate signal dispatcher + * + * @root = root task + * @on = Activate or =0 deactivate + * return: -1 error or 0 ok + */ +int +schedSignalDispatch(sched_root_task_t * __restrict root, int on) +{ + sigset_t ss; +#ifndef HAVE_LIBPTHREAD + sched_SetErr(ENOTSUP, "Library has not support pthreads"); + return -1; +#else + pthread_attr_t attr; +#endif + + if (!on) { + pthread_cancel(root->root_sigthr); + root->root_sigthr = NULL; + return 0; + } + + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); +#ifdef SCHED_RR + pthread_attr_setschedpolicy(&attr, SCHED_RR); +#else + pthread_attr_setschedpolicy(&attr, SCHED_OTHER); +#endif + + sigfillset(&ss); + pthread_sigmask(SIG_BLOCK, &ss, NULL); + if (pthread_create(&root->root_sigthr, &attr, _sched_sigDisp, root)) { + sched_SetErr(errno, "pthread_create(SignalDispatch) #%d - %s", + errno, strerror(errno)); + return -1; + } + + return 0; }