--- libaitsched/src/aitsched.c 2023/02/23 17:13:01 1.30.2.4 +++ libaitsched/src/aitsched.c 2024/03/20 12:48:45 1.36.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.30.2.4 2023/02/23 17:13:01 misho Exp $ +* $Id: aitsched.c,v 1.36.4.1 2024/03/20 12:48:45 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 - 2023 +Copyright 2004 - 2024 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -54,7 +54,9 @@ char sched_Error[STRSIZ]; #pragma GCC visibility pop +volatile pthread_t sched_sigThr; + // sched_GetErrno() Get error code of last operation int sched_GetErrno() @@ -181,7 +183,6 @@ schedRegisterHooks(sched_root_task_t * __restrict root 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 @@ -189,6 +190,7 @@ schedRegisterHooks(sched_root_task_t * __restrict root #ifdef HAVE_LIBPTHREAD root->root_hooks.hook_add.thread = sched_hook_thread; #endif + 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; @@ -211,6 +213,9 @@ schedInit(void ** __restrict data, size_t datlen) { sched_root_task_t *root = NULL; int (*func)(sched_root_task_t *); +#if SUP_ENABLE == KQ_SUPPORT + sigset_t ss; +#endif #ifdef HAVE_LIBPTHREAD register int i; #endif @@ -228,6 +233,12 @@ schedInit(void ** __restrict data, size_t datlen) sched_timespecinf(&root->root_poll); #ifdef HAVE_LIBPTHREAD + if (pthread_mutex_init(&root->root_sigmtx, NULL)) { + LOGERR; + e_free(root); + return NULL; + } + for (i = 0; i < taskMAX; i++) if ((errno = pthread_mutex_init(&root->root_mtx[i], NULL))) { LOGERR; @@ -262,7 +273,16 @@ schedInit(void ** __restrict data, size_t datlen) #ifdef HAVE_LIBPTHREAD for (i = 0; i < taskMAX; i++) pthread_mutex_unlock(&root->root_mtx[i]); + +#if SUP_ENABLE == KQ_SUPPORT + sigfillset(&ss); + pthread_sigmask(SIG_BLOCK, &ss, &root->root_oldset); +#else + pthread_sigmask(SIG_BLOCK, NULL, &root->root_oldset); #endif +#else + sigprocmask(SIG_BLOCK, NULL, &root->root_oldset); +#endif if (data && *data) { if (datlen) { @@ -394,7 +414,12 @@ schedEnd(sched_root_task_t ** __restrict root) #else (*root)->root_sigthr = NULL; #endif + pthread_sigmask(SIG_SETMASK, &(*root)->root_oldset, NULL); + pthread_mutex_unlock(&(*root)->root_sigmtx); } + pthread_mutex_destroy(&(*root)->root_sigmtx); +#else + sigprocmask(SIG_SETMASK, &(*root)->root_oldset, NULL); #endif e_free(*root); @@ -1051,7 +1076,7 @@ schedPolling(sched_root_task_t * __restrict root, stru int schedTermCondition(sched_root_task_t * __restrict root, intptr_t * __restrict condValue) { - if (!root && !condValue) + if (!root || !condValue) return -1; *root->root_cond = *condValue; @@ -1126,11 +1151,19 @@ _sched_sigDisp(void *arg) sched_root_task_t *root = arg; sched_task_t *task, *tmp; int sig, flg; + sigset_t ss; + sigfillset(&ss); while (root->root_sigthr) { - if (sigwait(&root->root_sigset, &sig)) + if (sigwait(&ss, &sig)) continue; + pthread_mutex_lock(&root->root_sigmtx); + if (!sigismember(&root->root_sigset, sig)) { + pthread_mutex_unlock(&root->root_sigmtx); + continue; + } + flg = 0; TAILQ_FOREACH_SAFE(task, &root->root_signal, task_node, tmp) { if (TASK_VAL(task) == (uintptr_t) sig) { @@ -1146,6 +1179,8 @@ _sched_sigDisp(void *arg) } if (flg < 2) sigdelset(&root->root_sigset, sig); + + pthread_mutex_unlock(&root->root_sigmtx); } return NULL; @@ -1156,12 +1191,13 @@ _sched_sigDisp(void *arg) * * @root = root task * @on = Activate or =0 deactivate - * return: -1 error or 0 ok + * return: -1 error, 1 already started, 2 another thread already started or 0 ok */ int schedSignalDispatch(sched_root_task_t * __restrict root, int on) { sigset_t ss; + struct timespec ts = { .tv_sec = 1, .tv_nsec = 0 }; #ifndef HAVE_LIBPTHREAD sched_SetErr(ENOTSUP, "Library has not support pthreads"); return -1; @@ -1169,16 +1205,34 @@ schedSignalDispatch(sched_root_task_t * __restrict roo pthread_attr_t attr; #endif +#if SUP_ENABLE == KQ_SUPPORT + return 0; +#endif + if (!on) { - pthread_cancel(root->root_sigthr); + if (root->root_sigthr) { + if (root->root_sigthr == sched_sigThr) { #ifdef __linux__ - root->root_sigthr = 0L; + sched_sigThr = 0L; #else - root->root_sigthr = NULL; + sched_sigThr = NULL; #endif + } + pthread_cancel(root->root_sigthr); +#ifdef __linux__ + root->root_sigthr = 0L; +#else + root->root_sigthr = NULL; +#endif + } + return 0; } + /* if we have not using polling, then we must turn on */ + if (sched_timespecisinf(&root->root_poll)) + schedPolling(root, &ts, NULL); + pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); #ifdef SCHED_RR @@ -1187,13 +1241,27 @@ schedSignalDispatch(sched_root_task_t * __restrict roo pthread_attr_setschedpolicy(&attr, SCHED_OTHER); #endif + /* if we have already started signal thread, then skip routine */ + if (root->root_sigthr) + return 1; + if (sched_sigThr) + return 2; + 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)); +#ifdef __linux__ + root->root_sigthr = 0L; +#else + root->root_sigthr = NULL; +#endif + pthread_sigmask(SIG_SETMASK, &root->root_oldset, NULL); return -1; - } + } else + sched_sigThr = root->root_sigthr; return 0; }