--- libaitsched/src/aitsched.c 2014/06/05 22:37:29 1.26 +++ libaitsched/src/aitsched.c 2024/02/26 12:56:21 1.35.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsched.c,v 1.26 2014/06/05 22:37:29 misho Exp $ +* $Id: aitsched.c,v 1.35.2.1 2024/02/26 12:56:21 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 - 2014 +Copyright 2004 - 2024 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -181,7 +181,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 +188,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,11 +211,14 @@ 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 - root = malloc(sizeof(sched_root_task_t)); + root = e_malloc(sizeof(sched_root_task_t)); if (!root) { LOGERR; } else { @@ -228,12 +231,18 @@ 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; while (i) pthread_mutex_destroy(&root->root_mtx[--i]); - free(root); + e_free(root); return NULL; } @@ -262,7 +271,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) { @@ -373,7 +391,7 @@ schedEnd(sched_root_task_t ** __restrict root) 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); } SCHED_QUNLOCK((*root), taskUNUSE); @@ -382,12 +400,27 @@ schedEnd(sched_root_task_t ** __restrict root) #ifdef HAVE_LIBPTHREAD 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); +#ifdef __linux__ + (*root)->root_sigthr = 0L; +#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 - free(*root); + e_free(*root); *root = NULL; return 0; } @@ -559,53 +592,52 @@ schedQuery(sched_task_t * __restrict task) * [ 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 + * return: NULL not found or !=NULL task */ -int +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; - register int flg = 0; if (!root) - return -1; + return NULL; /* 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 */ + 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) { @@ -658,51 +690,51 @@ schedQueryby(sched_root_task_t * __restrict root, sche queue = &root->root_thread; break; default: - return 1; /* not found */ + return NULL; /* not found */ } TAILQ_FOREACH(task, queue, task_node) { switch (criteria) { case CRITERIA_ANY: - return 0; /* found */ + return task; /* found */ case CRITERIA_CALL: if (TASK_FUNC(task) == (sched_task_func_t) param) - return 0; /* found */ + return task; /* found */ break; case CRITERIA_ARG: if (TASK_ARG(task) == param) - return 0; /* found */ + return task; /* found */ break; case CRITERIA_FD: if (TASK_FD(task) == (intptr_t) param) - return 0; /* found */ + return task; /* found */ break; case CRITERIA_ID: case CRITERIA_VAL: if (TASK_VAL(task) == (u_long) param) - return 0; /* found */ + return task; /* found */ break; case CRITERIA_TS: if (!sched_timespeccmp(&TASK_TS(task), (struct timespec*) param, -)) - return 0; /* found */ + return task; /* found */ break; case CRITERIA_DATA: if (TASK_DATA(task) == param) - return 0; /* found */ + return task; /* found */ break; case CRITERIA_DATLEN: if (TASK_DATLEN(task) == (size_t) param) - return 0; /* found */ + return task; /* found */ break; default: sched_SetErr(EINVAL, "Invalid parameter criteria %d", criteria); - return 1; /* not found */ + return NULL; /* not found */ } } - return 1; /* not found */ + return NULL; /* not found */ } /* @@ -1109,4 +1141,113 @@ schedResumeby(sched_root_task_t * __restrict root, u_c SCHED_QUNLOCK(root, taskSUSPEND); return flg; +} + +static void * +_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(&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) { + if (!flg) { + TASK_RET(task) = 0; + TASK_FLAG(task) = 0; + + /* remove signal handle */ + transit_task2ready(task, &root->root_signal); + } + flg++; + } + } + if (flg < 2) + sigdelset(&root->root_sigset, sig); + + pthread_mutex_unlock(&root->root_sigmtx); + } + + 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; + struct timespec ts = { .tv_sec = 1, .tv_nsec = 0 }; +#ifndef HAVE_LIBPTHREAD + sched_SetErr(ENOTSUP, "Library has not support pthreads"); + return -1; +#else + pthread_attr_t attr; +#endif + +#if SUP_ENABLE == KQ_SUPPORT + return 0; +#endif + + if (!on) { + if (root->root_sigthr) + pthread_cancel(root->root_sigthr); +#ifdef __linux__ + root->root_sigthr = 0L; +#else + root->root_sigthr = NULL; +#endif + return 0; + } + + /* if we have already started signal thread, then skip routine */ + if (root->root_sigthr) + 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 + 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)); +#ifdef __linux__ + root->root_sigthr = 0L; +#else + root->root_sigthr = NULL; +#endif + pthread_sigmask(SIG_SETMASK, &root->root_oldset, NULL); + return -1; + } + + return 0; }