--- libaitsched/src/hooks.c 2022/11/28 23:48:33 1.37.2.3 +++ 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.37.2.3 2022/11/28 23:48:33 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) @@ -213,7 +204,7 @@ sched_hook_cancel(void *task, void *arg __unused) struct kevent chg[1]; struct timespec timeout = { 0, 0 }; #elif SUP_ENABLE == EP_SUPPORT - struct epoll_event ee = { .events = 0, .data.fd = 0 }; + struct epoll_event ee = { .events = 0, .data.u64 = 0l }; #else register int i; #endif @@ -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 @@ -542,7 +536,7 @@ sched_hook_read(void *task, void *arg) struct kevent chg[1]; struct timespec timeout = { 0, 0 }; #elif SUP_ENABLE == EP_SUPPORT - struct epoll_event ee; + struct epoll_event ee = { 0 }; int flg = 0; #endif @@ -622,15 +616,16 @@ sched_hook_read(void *task, void *arg) * return: <0 errors and 0 ok */ void * -sched_hook_write(void *task, void *arg __unused) +sched_hook_write(void *task, void *arg) { sched_task_t *t = task; sched_root_task_t *r = NULL; + uintptr_t mask = (uintptr_t) arg; #if SUP_ENABLE == KQ_SUPPORT struct kevent chg[1]; struct timespec timeout = { 0, 0 }; #elif SUP_ENABLE == EP_SUPPORT - struct epoll_event ee; + struct epoll_event ee = { 0 }; int flg = 0; #endif @@ -641,9 +636,11 @@ sched_hook_write(void *task, void *arg __unused) #if SUP_ENABLE == KQ_SUPPORT #ifdef __NetBSD__ - EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR | mask, + 0, 0, (intptr_t) TASK_FD(t)); #else - EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR | mask, + 0, 0, (void*) TASK_FD(t)); #endif if (kevent(r->root_kq, chg, 1, NULL, 0, &timeout) == -1) { if (r->root_hooks.hook_exec.exception) @@ -653,8 +650,10 @@ sched_hook_write(void *task, void *arg __unused) return (void*) -1; } #elif SUP_ENABLE == EP_SUPPORT + if (!mask) + mask = EPOLLOUT; ee.data.fd = TASK_FD(t); - ee.events = EPOLLOUT; + ee.events = mask; if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) { flg |= 4; @@ -666,6 +665,7 @@ sched_hook_write(void *task, void *arg __unused) } if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) { flg |= 2; + ee.events |= EPOLLOUT; } if (epoll_ctl(r->root_kq, flg ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, TASK_FD(t), &ee) == -1) { @@ -675,9 +675,14 @@ sched_hook_write(void *task, void *arg __unused) LOGERR; return (void*) -1; } else - FD_SET(TASK_FD(t), &r->root_fds[1]); + if (mask & EPOLLOUT) + FD_SET(TASK_FD(t), &r->root_fds[1]); #else - FD_SET(TASK_FD(t), &r->root_fds[1]); + if (!mask) + FD_SET(TASK_FD(t), &r->root_fds[1]); + else + if (mask & 1) + FD_SET(TASK_FD(t), &r->root_fds[1]); if (TASK_FD(t) >= r->root_kq) r->root_kq = TASK_FD(t) + 1; @@ -812,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 }; @@ -835,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; } @@ -1207,6 +1216,7 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r } } + ops = EPOLL_CTL_DEL; if (rflg > 1 || wflg > 1) ops = EPOLL_CTL_MOD;