--- libaitsched/src/hooks.c 2022/12/20 22:40:32 1.39 +++ libaitsched/src/hooks.c 2023/02/23 17:13:01 1.39.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.39 2022/12/20 22:40:32 misho Exp $ +* $Id: hooks.c,v 1.39.4.1 2023/02/23 17:13:01 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 - 2022 +Copyright 2004 - 2023 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,15 +47,6 @@ SUCH DAMAGE. #include "hooks.h" -static inline void -transit_task2ready(sched_task_t * __restrict t, sched_queue_t * __restrict q) -{ - remove_task_from(t, q); - - t->task_type = taskREADY; - insert_task_to(t, &(TASK_ROOT(t))->root_ready); -} - #ifdef HAVE_LIBPTHREAD static void * _sched_threadWrapper(sched_task_t *t) @@ -359,11 +350,11 @@ sched_hook_cancel(void *task, void *arg __unused) #endif break; case taskSIGNAL: -#if SUP_ENABLE == KQ_SUPPORT /* check for multi subscribers */ TAILQ_FOREACH_SAFE(tt, &r->root_signal, task_node, tmp) if (TASK_VAL(tt) == TASK_VAL(t)) flg++; +#if SUP_ENABLE == KQ_SUPPORT #ifdef __NetBSD__ EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, flg < 2 ? EV_DELETE : 0, 0, 0, (intptr_t) TASK_VAL(t)); @@ -374,6 +365,9 @@ sched_hook_cancel(void *task, void *arg __unused) /* restore signal */ if (flg < 2) signal(TASK_VAL(t), SIG_DFL); +#else + if (flg < 2) + sigdelset(&TASK_ROOT(t)->root_sigset, TASK_VAL(t)); #endif break; #ifdef AIO_SUPPORT @@ -823,8 +817,9 @@ sched_hook_proc(void *task, void *arg __unused) void * sched_hook_signal(void *task, void *arg __unused) { -#if SUP_ENABLE == KQ_SUPPORT sched_task_t *t = task; + +#if SUP_ENABLE == KQ_SUPPORT struct kevent chg[1]; struct timespec timeout = { 0, 0 }; @@ -846,7 +841,10 @@ sched_hook_signal(void *task, void *arg __unused) LOGERR; return (void*) -1; } +#else + sigaddset(&TASK_ROOT(t)->root_sigset, TASK_VAL(t)); #endif + return NULL; }