--- libaitsched/src/hooks.c 2023/02/25 15:55:01 1.40 +++ libaitsched/src/hooks.c 2023/07/27 20:51:28 1.41 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.40 2023/02/25 15:55:01 misho Exp $ +* $Id: hooks.c,v 1.41 2023/07/27 20:51:28 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -362,16 +362,12 @@ sched_hook_cancel(void *task, void *arg __unused) EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, flg < 2 ? EV_DELETE : 0, 0, 0, (void*) TASK_VAL(t)); #endif - /* restore signal */ - if (flg < 2) - signal(TASK_VAL(t), SIG_DFL); -#else +#endif if (flg < 2) { pthread_mutex_lock(&TASK_ROOT(t)->root_sigmtx); sigdelset(&TASK_ROOT(t)->root_sigset, TASK_VAL(t)); pthread_mutex_unlock(&TASK_ROOT(t)->root_sigmtx); } -#endif break; #ifdef AIO_SUPPORT case taskAIO: @@ -821,17 +817,15 @@ void * sched_hook_signal(void *task, void *arg __unused) { sched_task_t *t = task; - #if SUP_ENABLE == KQ_SUPPORT struct kevent chg[1]; struct timespec timeout = { 0, 0 }; +#endif if (!t || !TASK_ROOT(t)) return (void*) -1; - /* ignore signal */ - signal(TASK_VAL(t), SIG_IGN); - +#if SUP_ENABLE == KQ_SUPPORT #ifdef __NetBSD__ EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_VAL(t)); #else @@ -844,11 +838,11 @@ sched_hook_signal(void *task, void *arg __unused) LOGERR; return (void*) -1; } -#else +#endif + pthread_mutex_lock(&TASK_ROOT(t)->root_sigmtx); sigaddset(&TASK_ROOT(t)->root_sigset, TASK_VAL(t)); pthread_mutex_unlock(&TASK_ROOT(t)->root_sigmtx); -#endif return NULL; }