--- libaitsched/src/hooks.c 2014/06/03 20:42:48 1.27.2.7 +++ libaitsched/src/hooks.c 2023/08/17 14:14:24 1.42 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.27.2.7 2014/06/03 20:42:48 misho Exp $ +* $Id: hooks.c,v 1.42 2023/08/17 14:14:24 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 - 2023 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,15 +47,77 @@ SUCH DAMAGE. #include "hooks.h" -static inline void -transit_task2ready(sched_task_t * __restrict t, sched_queue_t * __restrict q) +#ifdef HAVE_LIBPTHREAD +static void * +_sched_threadWrapper(sched_task_t *t) { - remove_task_from(t, q); + void *ret = NULL; + sched_root_task_t *r; - t->task_type = taskREADY; - insert_task_to(t, &(TASK_ROOT(t))->root_ready); + if (!t || !TASK_ROOT(t)) + pthread_exit(ret); + else + r = (sched_root_task_t*) TASK_ROOT(t); + + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); + /* + pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); + */ + + /* notify parent, thread is ready for execution */ + pthread_testcancel(); + + ret = schedCall(t); + r->root_ret = ret; + + if (TASK_VAL(t)) { + transit_task2unuse(t, &r->root_thread); + TASK_VAL(t) = 0; + } + + pthread_exit(ret); } +#endif +#if defined(HAVE_LIBRT) && defined(HAVE_TIMER_CREATE) && \ + defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) +#if SUP_ENABLE == KQ_SUPPORT +static void * +_sched_rtcWrapper(sched_task_t *t) +{ + sched_task_t *task; + void *ret; + + if (!t || !TASK_ROOT(t) || !TASK_DATA(t)) + return NULL; + else { + task = (sched_task_t*) TASK_DATA(t); + timer_delete((timer_t) TASK_DATLEN(t)); + } + + ret = schedCall(task); + + transit_task2unuse(task, &(TASK_ROOT(task))->root_rtc); + return ret; +} +#else +static void +_sched_rtcSigWrapper(int sig, siginfo_t *si, void *uc) +{ + sched_task_t *task; + + if (si && si->si_value.sival_ptr) { + task = (sched_task_t*) si->si_value.sival_ptr; + timer_delete((timer_t) TASK_FLAG(task)); + + TASK_RET(task) = (intptr_t) schedCall(task); + + transit_task2unuse(task, &(TASK_ROOT(task))->root_rtc); + } +} +#endif +#endif + /* * sched_hook_init() - Default INIT hook * @@ -85,9 +147,11 @@ sched_hook_init(void *root, void *arg __unused) } #else r->root_kq ^= r->root_kq; +#endif + FD_ZERO(&r->root_fds[0]); FD_ZERO(&r->root_fds[1]); -#endif + FD_ZERO(&r->root_fds[2]); return NULL; } @@ -113,11 +177,13 @@ sched_hook_fini(void *root, void *arg __unused) r->root_kq = 0; } #else - FD_ZERO(&r->root_fds[1]); - FD_ZERO(&r->root_fds[0]); r->root_kq ^= r->root_kq; #endif + FD_ZERO(&r->root_fds[2]); + FD_ZERO(&r->root_fds[1]); + FD_ZERO(&r->root_fds[0]); + return NULL; } @@ -133,12 +199,12 @@ sched_hook_cancel(void *task, void *arg __unused) { sched_task_t *t = task, *tmp, *tt; sched_root_task_t *r = NULL; - int flg; + int flg = 0; #if SUP_ENABLE == KQ_SUPPORT 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 @@ -158,11 +224,8 @@ sched_hook_cancel(void *task, void *arg __unused) switch (TASK_TYPE(t)) { case taskREAD: /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_read, task_node, tmp) - if (TASK_FD(tt) != TASK_FD(t)) - continue; - else + if (TASK_FD(tt) == TASK_FD(t)) flg++; #if SUP_ENABLE == KQ_SUPPORT #ifdef __NetBSD__ @@ -174,33 +237,38 @@ sched_hook_cancel(void *task, void *arg __unused) #endif #elif SUP_ENABLE == EP_SUPPORT ee.data.fd = TASK_FD(t); + ee.events ^= ee.events; if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) - ee.events = EPOLLOUT; + ee.events |= EPOLLOUT; - if (flg < 2) + if (flg < 2) { FD_CLR(TASK_FD(t), &r->root_fds[0]); - else - ee.events |= (EPOLLIN | EPOLLPRI | EPOLLRDHUP); + FD_CLR(TASK_FD(t), &r->root_fds[2]); + } else { + if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) + ee.events |= EPOLLIN; + if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) + ee.events |= EPOLLPRI; + } #else if (flg < 2) { FD_CLR(TASK_FD(t), &r->root_fds[0]); + FD_CLR(TASK_FD(t), &r->root_fds[2]); /* optimize select */ - for (i = r->root_kq - 1; i > 2; i--) - if (FD_ISSET(i, &r->root_fds[0]) || FD_ISSET(i, &r->root_fds[1])) + for (i = r->root_kq - 1; i >= 0; i--) + if (FD_ISSET(i, &r->root_fds[0]) || + FD_ISSET(i, &r->root_fds[1]) || + FD_ISSET(i, &r->root_fds[2])) break; - if (i > 2) - r->root_kq = i + 1; + r->root_kq = i + 1; } #endif break; case taskWRITE: /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_write, task_node, tmp) - if (TASK_FD(tt) != TASK_FD(t)) - continue; - else + if (TASK_FD(tt) == TASK_FD(t)) flg++; #if SUP_ENABLE == KQ_SUPPORT #ifdef __NetBSD__ @@ -212,8 +280,11 @@ sched_hook_cancel(void *task, void *arg __unused) #endif #elif SUP_ENABLE == EP_SUPPORT ee.data.fd = TASK_FD(t); + ee.events ^= ee.events; if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) - ee.events = EPOLLIN | EPOLLPRI | EPOLLRDHUP; + ee.events |= EPOLLIN; + if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) + ee.events |= EPOLLPRI; if (flg < 2) FD_CLR(TASK_FD(t), &r->root_fds[1]); @@ -224,22 +295,20 @@ sched_hook_cancel(void *task, void *arg __unused) FD_CLR(TASK_FD(t), &r->root_fds[1]); /* optimize select */ - for (i = r->root_kq - 1; i > 2; i--) - if (FD_ISSET(i, &r->root_fds[0]) || FD_ISSET(i, &r->root_fds[1])) + for (i = r->root_kq - 1; i >= 0; i--) + if (FD_ISSET(i, &r->root_fds[0]) || + FD_ISSET(i, &r->root_fds[1]) || + FD_ISSET(i, &r->root_fds[2])) break; - if (i > 2) - r->root_kq = i + 1; + r->root_kq = i + 1; } #endif break; case taskALARM: #if SUP_ENABLE == KQ_SUPPORT /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_alarm, task_node, tmp) - if (TASK_DATA(tt) != TASK_DATA(t)) - continue; - else + if (TASK_DATA(tt) == TASK_DATA(t)) flg++; #ifdef __NetBSD__ EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, flg < 2 ? EV_DELETE : 0, @@ -253,11 +322,8 @@ sched_hook_cancel(void *task, void *arg __unused) case taskNODE: #if SUP_ENABLE == KQ_SUPPORT /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_node, task_node, tmp) - if (TASK_FD(tt) != TASK_FD(t)) - continue; - else + if (TASK_FD(tt) == TASK_FD(t)) flg++; #ifdef __NetBSD__ EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, flg < 2 ? EV_DELETE : 0, @@ -271,11 +337,8 @@ sched_hook_cancel(void *task, void *arg __unused) case taskPROC: #if SUP_ENABLE == KQ_SUPPORT /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_proc, task_node, tmp) - if (TASK_VAL(tt) != TASK_VAL(t)) - continue; - else + if (TASK_VAL(tt) == TASK_VAL(t)) flg++; #ifdef __NetBSD__ EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, flg < 2 ? EV_DELETE : 0, @@ -287,14 +350,11 @@ sched_hook_cancel(void *task, void *arg __unused) #endif break; case taskSIGNAL: -#if SUP_ENABLE == KQ_SUPPORT /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_signal, task_node, tmp) - if (TASK_VAL(tt) != TASK_VAL(t)) - continue; - else + 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)); @@ -302,19 +362,19 @@ 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 */ - signal(TASK_VAL(t), SIG_DFL); #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); + } break; #ifdef AIO_SUPPORT case taskAIO: #if SUP_ENABLE == KQ_SUPPORT /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_aio, task_node, tmp) - if (TASK_VAL(tt) != TASK_VAL(t)) - continue; - else + if (TASK_VAL(tt) == TASK_VAL(t)) flg++; #ifdef __NetBSD__ EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, flg < 2 ? EV_DELETE : 0, @@ -327,7 +387,7 @@ sched_hook_cancel(void *task, void *arg __unused) if (acb) { if (aio_cancel(acb->aio_fildes, acb) == AIO_CANCELED) aio_return(acb); - free(acb); + e_free(acb); TASK_VAL(t) = 0; } #endif @@ -336,11 +396,8 @@ sched_hook_cancel(void *task, void *arg __unused) case taskLIO: #if SUP_ENABLE == KQ_SUPPORT /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_lio, task_node, tmp) - if (TASK_VAL(tt) != TASK_VAL(t)) - continue; - else + if (TASK_VAL(tt) == TASK_VAL(t)) flg++; #ifdef __NetBSD__ EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, flg < 2 ? EV_DELETE : 0, @@ -354,9 +411,9 @@ sched_hook_cancel(void *task, void *arg __unused) for (i = 0; i < TASK_DATLEN(t); i++) { if (aio_cancel(acbs[i]->aio_fildes, acbs[i]) == AIO_CANCELED) aio_return(acbs[i]); - free(acbs[i]); + e_free(acbs[i]); } - free(acbs); + e_free(acbs); TASK_VAL(t) = 0; } #endif @@ -367,11 +424,8 @@ sched_hook_cancel(void *task, void *arg __unused) case taskUSER: #if SUP_ENABLE == KQ_SUPPORT /* check for multi subscribers */ - flg = 0; TAILQ_FOREACH_SAFE(tt, &r->root_user, task_node, tmp) - if (TASK_VAL(tt) != TASK_VAL(t)) - continue; - else + if (TASK_VAL(tt) == TASK_VAL(t)) flg++; #ifdef __NetBSD__ EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, flg < 2 ? EV_DELETE : 0, @@ -395,10 +449,22 @@ sched_hook_cancel(void *task, void *arg __unused) } #endif return NULL; -#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) +#if defined(HAVE_LIBRT) && defined(HAVE_TIMER_CREATE) && \ + defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) case taskRTC: timer_delete((timer_t) TASK_FLAG(t)); +#if SUP_ENABLE == KQ_SUPPORT schedCancel((sched_task_t*) TASK_RET(t)); +#else + /* check for multi subscribers */ + TAILQ_FOREACH_SAFE(tt, &r->root_rtc, task_node, tmp) + if (TASK_DATA(tt) == TASK_DATA(t)) + flg++; + + /* restore signal */ + if (flg < 2) + signal((intptr_t) TASK_DATA(t) + SIGRTMIN, SIG_DFL); +#endif return NULL; #endif /* HAVE_TIMER_CREATE */ default: @@ -408,7 +474,9 @@ sched_hook_cancel(void *task, void *arg __unused) #if SUP_ENABLE == KQ_SUPPORT kevent(r->root_kq, chg, 1, NULL, 0, &timeout); #elif SUP_ENABLE == EP_SUPPORT - epoll_ctl(r->root_kq, ee.events ? EPOLL_CTL_MOD : EPOLL_CTL_DEL, ee.data.fd, &ee); + if (TASK_TYPE(t) == taskREAD || TASK_TYPE(t) == taskWRITE) { + epoll_ctl(r->root_kq, ee.events ? EPOLL_CTL_MOD : EPOLL_CTL_DEL, ee.data.fd, &ee); + } #endif return NULL; } @@ -458,15 +526,16 @@ sched_hook_thread(void *task, void *arg) * return: <0 errors and 0 ok */ void * -sched_hook_read(void *task, void *arg __unused) +sched_hook_read(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 = { .events = EPOLLIN | EPOLLPRI | EPOLLRDHUP, .data.fd = 0 }; + struct epoll_event ee = { 0 }; int flg = 0; #endif @@ -477,9 +546,11 @@ sched_hook_read(void *task, void *arg __unused) #if SUP_ENABLE == KQ_SUPPORT #ifdef __NetBSD__ - EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR | mask, + 0, 0, (intptr_t) TASK_FD(t)); #else - EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, 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) @@ -489,24 +560,46 @@ sched_hook_read(void *task, void *arg __unused) return (void*) -1; } #elif SUP_ENABLE == EP_SUPPORT - if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) + if (!mask) + mask = EPOLLIN | EPOLLPRI; + ee.data.fd = TASK_FD(t); + ee.events = mask; + if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) { + flg |= 4; + ee.events |= EPOLLPRI; + } + if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) { flg |= 1; + ee.events |= EPOLLIN; + } if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) { flg |= 2; ee.events |= EPOLLOUT; } - ee.data.fd = TASK_FD(t); if (epoll_ctl(r->root_kq, flg ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, TASK_FD(t), &ee) == -1) { if (r->root_hooks.hook_exec.exception) r->root_hooks.hook_exec.exception(r, NULL); else LOGERR; return (void*) -1; - } else - FD_SET(TASK_FD(t), &r->root_fds[0]); + } else { + if (mask & EPOLLIN) + FD_SET(TASK_FD(t), &r->root_fds[0]); + if (mask & EPOLLPRI) + FD_SET(TASK_FD(t), &r->root_fds[2]); + } #else - FD_SET(TASK_FD(t), &r->root_fds[0]); + if (!mask) { + FD_SET(TASK_FD(t), &r->root_fds[0]); + FD_SET(TASK_FD(t), &r->root_fds[2]); + } else { + if (mask & 1) + FD_SET(TASK_FD(t), &r->root_fds[0]); + if (mask & 2) + FD_SET(TASK_FD(t), &r->root_fds[2]); + } + if (TASK_FD(t) >= r->root_kq) r->root_kq = TASK_FD(t) + 1; #endif @@ -522,15 +615,16 @@ sched_hook_read(void *task, void *arg __unused) * 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 = { .events = EPOLLOUT, .data.fd = 0 }; + struct epoll_event ee = { 0 }; int flg = 0; #endif @@ -541,9 +635,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) @@ -553,14 +649,24 @@ 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 = mask; + + if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) { + flg |= 4; + ee.events |= EPOLLPRI; + } if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) { flg |= 1; - ee.events |= EPOLLIN | EPOLLPRI | EPOLLRDHUP; + ee.events |= EPOLLIN; } - if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) + if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) { flg |= 2; + ee.events |= EPOLLOUT; + } - ee.data.fd = TASK_FD(t); if (epoll_ctl(r->root_kq, flg ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, TASK_FD(t), &ee) == -1) { if (r->root_hooks.hook_exec.exception) r->root_hooks.hook_exec.exception(r, NULL); @@ -568,9 +674,15 @@ 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; #endif @@ -621,16 +733,17 @@ sched_hook_alarm(void *task, void *arg __unused) * sched_hook_node() - Default NODE hook * * @task = current task - * @arg = unused + * @arg = if arg == 42 then waiting for all events * return: <0 errors and 0 ok */ void * -sched_hook_node(void *task, void *arg __unused) +sched_hook_node(void *task, void *arg) { #if SUP_ENABLE == KQ_SUPPORT sched_task_t *t = task; struct kevent chg[1]; struct timespec timeout = { 0, 0 }; + u_int addflags = (u_int) (uintptr_t) arg; if (!t || !TASK_ROOT(t)) return (void*) -1; @@ -638,11 +751,11 @@ sched_hook_node(void *task, void *arg __unused) #ifdef __NetBSD__ EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | - NOTE_LINK | NOTE_RENAME | NOTE_REVOKE, 0, (intptr_t) TASK_FD(t)); + NOTE_LINK | NOTE_RENAME | NOTE_REVOKE | addflags, 0, (intptr_t) TASK_FD(t)); #else EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | - NOTE_LINK | NOTE_RENAME | NOTE_REVOKE, 0, (void*) TASK_FD(t)); + NOTE_LINK | NOTE_RENAME | NOTE_REVOKE | addflags, 0, (void*) TASK_FD(t)); #endif if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { if (TASK_ROOT(t)->root_hooks.hook_exec.exception) @@ -703,17 +816,16 @@ 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 }; +#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 @@ -726,25 +838,12 @@ sched_hook_signal(void *task, void *arg __unused) LOGERR; return (void*) -1; } -#else -#if 0 - sched_task_t *t = task; - struct sigaction sa; +#endif - memset(&sa, 0, sizeof sa); - sigemptyset(&sa.sa_mask); - sa.sa_handler = _sched_sigHandler; - sa.sa_flags = SA_RESETHAND | SA_RESTART; + 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); - if (sigaction(TASK_VAL(t), &sa, NULL) == -1) { - if (TASK_ROOT(t)->root_hooks.hook_exec.exception) - TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); - else - LOGERR; - return (void*) -1; - } -#endif /* 0 */ -#endif return NULL; } @@ -800,7 +899,6 @@ fetch_hook_kevent_proceed(int en, struct kevent *res, struct aiocb *acb; #ifdef EVFILT_LIO int l; - register int j; off_t off; struct aiocb **acbs; struct iovec *iv; @@ -811,223 +909,200 @@ fetch_hook_kevent_proceed(int en, struct kevent *res, memcpy(evt, &res[i], sizeof evt); evt->flags = EV_DELETE; /* Put read/write task to ready queue */ + flg = 0; switch (res[i].filter) { case EVFILT_READ: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) { - if (TASK_FD(task) != ((intptr_t) res[i].udata)) - continue; - else { - flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; - } - /* remove read handle */ - remove_task_from(task, &r->root_read); + if (TASK_FD(task) == ((intptr_t) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; - if (r->root_hooks.hook_exec.exception && res[i].flags & EV_EOF) { - if (r->root_hooks.hook_exec.exception(r, (void*) EV_EOF)) { - task->task_type = taskUNUSE; - insert_task_to(task, &r->root_unuse); - } else { - task->task_type = taskREADY; - insert_task_to(task, &r->root_ready); + /* remove read handle */ + remove_task_from(task, &r->root_read); + + if (r->root_hooks.hook_exec.exception && res[i].flags & EV_EOF) { + if (r->root_hooks.hook_exec.exception(r, (void*) EV_EOF)) { + task->task_type = taskUNUSE; + insert_task_to(task, &r->root_unuse); + } else { + task->task_type = taskREADY; + insert_task_to(task, &r->root_ready); + } + } else { + task->task_type = taskREADY; + insert_task_to(task, &r->root_ready); + } } - } else { - task->task_type = taskREADY; - insert_task_to(task, &r->root_ready); + flg++; } } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; case EVFILT_WRITE: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) { - if (TASK_FD(task) != ((intptr_t) res[i].udata)) - continue; - else { - flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; - } - /* remove write handle */ - remove_task_from(task, &r->root_write); + if (TASK_FD(task) == ((intptr_t) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; - if (r->root_hooks.hook_exec.exception && res[i].flags & EV_EOF) { - if (r->root_hooks.hook_exec.exception(r, (void*) EV_EOF)) { - task->task_type = taskUNUSE; - insert_task_to(task, &r->root_unuse); - } else { - task->task_type = taskREADY; - insert_task_to(task, &r->root_ready); + /* remove write handle */ + remove_task_from(task, &r->root_write); + + if (r->root_hooks.hook_exec.exception && res[i].flags & EV_EOF) { + if (r->root_hooks.hook_exec.exception(r, (void*) EV_EOF)) { + task->task_type = taskUNUSE; + insert_task_to(task, &r->root_unuse); + } else { + task->task_type = taskREADY; + insert_task_to(task, &r->root_ready); + } + } else { + task->task_type = taskREADY; + insert_task_to(task, &r->root_ready); + } } - } else { - task->task_type = taskREADY; - insert_task_to(task, &r->root_ready); + flg++; } } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; case EVFILT_TIMER: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) { - if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata)) - continue; - else { + if ((uintptr_t) TASK_DATA(task) == ((uintptr_t) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; + + /* remove alarm handle */ + transit_task2ready(task, &r->root_alarm); + } flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; } - /* remove alarm handle */ - transit_task2ready(task, &r->root_alarm); } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; case EVFILT_VNODE: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_node, task_node, tmp) { - if (TASK_FD(task) != ((intptr_t) res[i].udata)) - continue; - else { + if (TASK_FD(task) == ((intptr_t) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; + + /* remove node handle */ + transit_task2ready(task, &r->root_node); + } flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; } - /* remove node handle */ - transit_task2ready(task, &r->root_node); } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; case EVFILT_PROC: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_proc, task_node, tmp) { - if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) - continue; - else { + if (TASK_VAL(task) == ((uintptr_t) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; + + /* remove proc handle */ + transit_task2ready(task, &r->root_proc); + } flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; } - /* remove proc handle */ - transit_task2ready(task, &r->root_proc); } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; case EVFILT_SIGNAL: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) { - if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) - continue; - else { + if (TASK_VAL(task) == ((uintptr_t) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; + + /* remove signal handle */ + transit_task2ready(task, &r->root_signal); + } flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; } - /* remove signal handle */ - transit_task2ready(task, &r->root_signal); } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; #ifdef AIO_SUPPORT case EVFILT_AIO: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) { acb = (struct aiocb*) TASK_VAL(task); - if (acb != ((struct aiocb*) res[i].udata)) - continue; - else { + if (acb == ((struct aiocb*) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; + + /* remove user handle */ + transit_task2ready(task, &r->root_aio); + + fd = acb->aio_fildes; + if ((len = aio_return(acb)) != -1) { + if (lseek(fd, acb->aio_offset + len, SEEK_CUR) == -1) + LOGERR; + } else + LOGERR; + e_free(acb); + TASK_DATLEN(task) = (u_long) len; + TASK_FD(task) = fd; + } flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; } - /* remove user handle */ - transit_task2ready(task, &r->root_aio); - - fd = acb->aio_fildes; - if ((len = aio_return(acb)) != -1) { - if (lseek(fd, acb->aio_offset + len, SEEK_CUR) == -1) - LOGERR; - } else - LOGERR; - free(acb); - TASK_DATLEN(task) = (u_long) len; - TASK_FD(task) = fd; } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; #ifdef EVFILT_LIO case EVFILT_LIO: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_lio, task_node, tmp) { acbs = (struct aiocb**) TASK_VAL(task); - if (acbs != ((struct aiocb**) res[i].udata)) - continue; - else { - flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; - } - /* remove user handle */ - transit_task2ready(task, &r->root_lio); + if (acbs == ((struct aiocb**) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; - iv = (struct iovec*) TASK_DATA(task); - fd = acbs[0]->aio_fildes; - off = acbs[0]->aio_offset; - for (j = len = 0; i < TASK_DATLEN(task); len += l, i++) { - if ((iv[i].iov_len = aio_return(acbs[i])) == -1) - l = 0; - else - l = iv[i].iov_len; - free(acbs[i]); - } - free(acbs); - TASK_DATLEN(task) = (u_long) len; - TASK_FD(task) = fd; + /* remove user handle */ + transit_task2ready(task, &r->root_lio); - if (lseek(fd, off + len, SEEK_CUR) == -1) - LOGERR; + iv = (struct iovec*) TASK_DATA(task); + fd = acbs[0]->aio_fildes; + off = acbs[0]->aio_offset; + for (len = 0; i < TASK_DATLEN(task); len += l, i++) { + if ((iv[i].iov_len = aio_return(acbs[i])) == -1) + l = 0; + else + l = iv[i].iov_len; + e_free(acbs[i]); + } + e_free(acbs); + TASK_DATLEN(task) = (u_long) len; + TASK_FD(task) = fd; + + if (lseek(fd, off + len, SEEK_CUR) == -1) + LOGERR; + } + flg++; + } } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; #endif /* EVFILT_LIO */ #endif /* AIO_SUPPORT */ #ifdef EVFILT_USER case EVFILT_USER: - flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_user, task_node, tmp) { - if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) - continue; - else { + if (TASK_VAL(task) == ((uintptr_t) res[i].udata)) { + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; + + /* remove user handle */ + transit_task2ready(task, &r->root_user); + } flg++; - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; } - /* remove user handle */ - transit_task2ready(task, &r->root_user); } - /* if match at least 2, don't remove resouce of event */ - if (flg > 1) - evt->flags ^= evt->flags; break; #endif /* EVFILT_USER */ } + if (flg > 1) + evt->flags &= ~EV_DELETE; + if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) { if (r->root_hooks.hook_exec.exception) r->root_hooks.hook_exec.exception(r, NULL); @@ -1042,30 +1117,28 @@ fetch_hook_kevent_proceed(int en, struct kevent *res, static inline void fetch_hook_epoll_proceed(int en, struct epoll_event *res, sched_root_task_t *r) { - register int i, flg; + register int i, rflg, wflg; int ops = EPOLL_CTL_DEL; - sched_task_t *task, *tmp; + sched_task_t *t, *tmp, *task; struct epoll_event evt[1]; for (i = 0; i < en; i++) { memcpy(evt, &res[i], sizeof evt); + evt->events ^= evt->events; + rflg = wflg = 0; - if (evt->events & (EPOLLIN | EPOLLPRI | EPOLLET)) { - flg = 0; - TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) { - if (TASK_FD(task) != evt->data.fd) - continue; - else { - flg++; - FD_CLR(TASK_FD(task), &r->root_fds[0]); - TASK_FLAG(task) = ioctl(TASK_FD(task), FIONREAD, &TASK_RET(task)); - - evt->events &= ~(EPOLLIN | EPOLLPRI | EPOLLET | EPOLLRDHUP); - if (FD_ISSET(TASK_FD(task), &r->root_fds[1])) { - ops = EPOLL_CTL_MOD; - evt->events |= EPOLLOUT; - } + if (res[i].events & (EPOLLIN | EPOLLPRI)) { + task = NULL; + TAILQ_FOREACH_SAFE(t, &r->root_read, task_node, tmp) { + if (TASK_FD(t) == evt->data.fd) { + if (!task) + task = t; + rflg++; } + } + + if (task) { + TASK_FLAG(task) = ioctl(TASK_FD(task), FIONREAD, &TASK_RET(task)); /* remove read handle */ remove_task_from(task, &r->root_read); @@ -1082,28 +1155,34 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r task->task_type = taskREADY; insert_task_to(task, &r->root_ready); } + + if (!(res[i].events & EPOLLOUT) && FD_ISSET(evt->data.fd, &r->root_fds[1])) { + evt->events |= EPOLLOUT; + wflg = 42; + } + if (rflg > 1) { + if (FD_ISSET(evt->data.fd, &r->root_fds[0])) + evt->events |= EPOLLIN; + if (FD_ISSET(evt->data.fd, &r->root_fds[2])) + evt->events |= EPOLLPRI; + } else { + FD_CLR(evt->data.fd, &r->root_fds[0]); + FD_CLR(evt->data.fd, &r->root_fds[2]); + } } - if (flg > 1) - ops = EPOLL_CTL_MOD; } - - if (evt->events & EPOLLOUT) { - flg = 0; - TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) { - if (TASK_FD(task) != evt->data.fd) - continue; - else { - flg++; - FD_CLR(TASK_FD(task), &r->root_fds[1]); - TASK_FLAG(task) = ioctl(TASK_FD(task), - FIONWRITE, &TASK_RET(task)); - - evt->events &= ~EPOLLOUT; - if (FD_ISSET(TASK_FD(task), &r->root_fds[0])) { - ops = EPOLL_CTL_MOD; - evt->events |= EPOLLIN | EPOLLPRI | EPOLLRDHUP; - } + if (res[i].events & EPOLLOUT) { + task = NULL; + TAILQ_FOREACH_SAFE(t, &r->root_write, task_node, tmp) { + if (TASK_FD(t) == evt->data.fd) { + if (!task) + task = t; + wflg++; } + } + + if (task) { + TASK_FLAG(task) = ioctl(TASK_FD(task), FIONWRITE, &TASK_RET(task)); /* remove write handle */ remove_task_from(task, &r->root_write); @@ -1120,11 +1199,26 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r task->task_type = taskREADY; insert_task_to(task, &r->root_ready); } + + if (!(res[i].events & EPOLLIN) && FD_ISSET(evt->data.fd, &r->root_fds[0])) { + evt->events |= EPOLLIN; + rflg = 42; + } + if (!(res[i].events & EPOLLPRI) && FD_ISSET(evt->data.fd, &r->root_fds[2])) { + evt->events |= EPOLLPRI; + rflg = 42; + } + if (wflg > 1) + evt->events |= EPOLLOUT; + else + FD_CLR(evt->data.fd, &r->root_fds[1]); } - if (flg > 1) - ops = EPOLL_CTL_MOD; } + ops = EPOLL_CTL_DEL; + if (rflg > 1 || wflg > 1) + ops = EPOLL_CTL_MOD; + if (epoll_ctl(r->root_kq, ops, evt->data.fd, evt) == -1) { if (r->root_hooks.hook_exec.exception) { r->root_hooks.hook_exec.exception(r, NULL); @@ -1139,24 +1233,34 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r static inline void fetch_hook_select_proceed(int en, fd_set rfd, fd_set wfd, fd_set xfd, sched_root_task_t *r) { - register int i, flg; - sched_task_t *task, *tmp; + register int i, rflg, wflg; + sched_task_t *t, *tmp, *task; /* skip select check if return value from select is zero */ if (!en) return; for (i = 0; i < r->root_kq; i++) { + if (!FD_ISSET(i, &r->root_fds[0]) && + !FD_ISSET(i, &r->root_fds[1]) && + !FD_ISSET(i, &r->root_fds[2])) + continue; + + rflg = wflg = 0; + if (FD_ISSET(i, &rfd) || FD_ISSET(i, &xfd)) { - flg = 0; - TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) { - if (TASK_FD(task) != i) - continue; - else { - flg++; - TASK_FLAG(task) = ioctl(TASK_FD(task), - FIONREAD, &TASK_RET(task)); + task = NULL; + TAILQ_FOREACH_SAFE(t, &r->root_read, task_node, tmp) { + if (TASK_FD(t) == i) { + if (!task) + task = t; + rflg++; } + } + + if (task) { + TASK_FLAG(task) = ioctl(TASK_FD(task), FIONREAD, &TASK_RET(task)); + /* remove read handle */ remove_task_from(task, &r->root_read); @@ -1172,22 +1276,27 @@ fetch_hook_select_proceed(int en, fd_set rfd, fd_set w task->task_type = taskREADY; insert_task_to(task, &r->root_ready); } + + /* remove resouce */ + if (rflg == 1) { + FD_CLR(i, &r->root_fds[0]); + FD_CLR(i, &r->root_fds[2]); + } } - /* if match equal to 1, remove resouce */ - if (flg == 1) - FD_CLR(i, &r->root_fds[0]); } - if (FD_ISSET(i, &wfd)) { - flg = 0; - TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) { - if (TASK_FD(task) != i) - continue; - else { - flg++; - TASK_FLAG(task) = ioctl(TASK_FD(task), - FIONWRITE, &TASK_RET(task)); + task = NULL; + TAILQ_FOREACH_SAFE(t, &r->root_write, task_node, tmp) { + if (TASK_FD(t) == i) { + if (!task) + task = t; + wflg++; } + } + + if (task) { + TASK_FLAG(task) = ioctl(TASK_FD(task), FIONWRITE, &TASK_RET(task)); + /* remove write handle */ remove_task_from(task, &r->root_write); @@ -1203,19 +1312,21 @@ fetch_hook_select_proceed(int en, fd_set rfd, fd_set w task->task_type = taskREADY; insert_task_to(task, &r->root_ready); } + + /* remove resouce */ + if (wflg == 1) + FD_CLR(i, &r->root_fds[1]); } - /* if match equal to 1, remove resouce */ - if (flg == 1) - FD_CLR(i, &r->root_fds[1]); } } /* optimize select */ - for (i = r->root_kq - 1; i > 2; i--) - if (FD_ISSET(i, &r->root_fds[0]) || FD_ISSET(i, &r->root_fds[1])) + for (i = r->root_kq - 1; i >= 0; i--) + if (FD_ISSET(i, &r->root_fds[0]) || + FD_ISSET(i, &r->root_fds[1]) || + FD_ISSET(i, &r->root_fds[2])) break; - if (i > 2) - r->root_kq = i + 1; + r->root_kq = i + 1; } #endif @@ -1231,7 +1342,7 @@ sched_hook_fetch(void *root, void *arg __unused) { sched_root_task_t *r = root; sched_task_t *task, *tmp; - struct timespec now, m, mtmp; + struct timespec now, m, mtmp, *tsmin; #if SUP_ENABLE == KQ_SUPPORT struct kevent res[KQ_EVENTS]; struct timespec *timeout; @@ -1257,48 +1368,59 @@ sched_hook_fetch(void *root, void *arg __unused) return task; } + /* if present member of task, set NOWAIT */ + if (!TAILQ_FIRST(&r->root_task)) { + /* timer tasks */ #ifdef TIMER_WITHOUT_SORT - clock_gettime(CLOCK_MONOTONIC, &now); + clock_gettime(CLOCK_MONOTONIC, &now); - sched_timespecclear(&r->root_wait); - TAILQ_FOREACH(task, &r->root_timer, task_node) { - if (!sched_timespecisset(&r->root_wait)) - r->root_wait = TASK_TS(task); - else if (sched_timespeccmp(&TASK_TS(task), &r->root_wait, -) < 0) - r->root_wait = TASK_TS(task); - } + sched_timespecclear(&r->root_wait); + TAILQ_FOREACH(task, &r->root_timer, task_node) { + if (!sched_timespecisset(&r->root_wait)) + r->root_wait = TASK_TS(task); + else if (sched_timespeccmp(&TASK_TS(task), &r->root_wait, -) < 0) + r->root_wait = TASK_TS(task); + } - if (TAILQ_FIRST(&r->root_timer)) { - m = r->root_wait; - sched_timespecsub(&m, &now, &mtmp); - r->root_wait = mtmp; - } else { - /* set wait INFTIM */ - sched_timespecinf(&r->root_wait); - } + if (TAILQ_FIRST(&r->root_timer)) { + m = r->root_wait; + sched_timespecsub(&m, &now, &mtmp); + if (mtmp.tv_sec < 0 || mtmp.tv_nsec < 0) + /* don't wait for events. we have ready timer */ + sched_timespecclear(&r->root_wait); + else + r->root_wait = mtmp; + } else { + /* set wait INFTIM */ + sched_timespecinf(&r->root_wait); + } #else /* ! TIMER_WITHOUT_SORT */ - if (!TAILQ_FIRST(&r->root_task) && (task = TAILQ_FIRST(&r->root_timer))) { - clock_gettime(CLOCK_MONOTONIC, &now); + if ((task = TAILQ_FIRST(&r->root_timer))) { + clock_gettime(CLOCK_MONOTONIC, &now); - m = TASK_TS(task); - sched_timespecsub(&m, &now, &mtmp); - r->root_wait = mtmp; - } else { - /* set wait INFTIM */ - sched_timespecinf(&r->root_wait); - } + m = TASK_TS(task); + sched_timespecsub(&m, &now, &mtmp); + if (mtmp.tv_sec < 0 || mtmp.tv_nsec < 0) + /* don't wait for events. we have ready timer */ + sched_timespecclear(&r->root_wait); + else + r->root_wait = mtmp; + } else { + /* set wait INFTIM */ + sched_timespecinf(&r->root_wait); + } #endif /* TIMER_WITHOUT_SORT */ - /* if present member of task, set NOWAIT */ - if (TAILQ_FIRST(&r->root_task)) + } else /* no waiting for event, because we have ready task */ sched_timespecclear(&r->root_wait); - if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1) { + if (!sched_timespecisinf(&r->root_wait)) { + tsmin = sched_timespecmin(&r->root_wait, &r->root_poll); #if SUP_ENABLE == KQ_SUPPORT - timeout = &r->root_wait; + timeout = tsmin; #elif SUP_ENABLE == EP_SUPPORT - timeout = r->root_wait.tv_sec * 1000 + r->root_wait.tv_nsec / 1000000; + timeout = tsmin->tv_sec * 1000 + tsmin->tv_nsec / 1000000; #else - sched_timespec2val(&r->root_wait, &tv); + sched_timespec2val(tsmin, &tv); timeout = &tv; #endif /* KQ_SUPPORT */ } else if (sched_timespecisinf(&r->root_poll)) @@ -1323,7 +1445,8 @@ sched_hook_fetch(void *root, void *arg __unused) #elif SUP_ENABLE == EP_SUPPORT if ((en = epoll_wait(r->root_kq, res, KQ_EVENTS, timeout)) == -1) { #else - rfd = xfd = r->root_fds[0]; + xfd = r->root_fds[2]; + rfd = r->root_fds[0]; wfd = r->root_fds[1]; if ((en = select(r->root_kq, &rfd, &wfd, &xfd, timeout)) == -1) { #endif /* KQ_SUPPORT */ @@ -1430,14 +1553,18 @@ sched_hook_condition(void *root, void *arg) * @arg = unused * return: <0 errors and 0 ok */ -#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) void * sched_hook_rtc(void *task, void *arg __unused) { +#if defined(HAVE_LIBRT) && defined(HAVE_TIMER_CREATE) && \ + defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_DELETE) sched_task_t *sigt = NULL, *t = task; struct itimerspec its; struct sigevent evt; timer_t tmr; +#if SUP_ENABLE != KQ_SUPPORT + struct sigaction sa; +#endif if (!t || !TASK_ROOT(t)) return (void*) -1; @@ -1445,7 +1572,7 @@ sched_hook_rtc(void *task, void *arg __unused) memset(&evt, 0, sizeof evt); evt.sigev_notify = SIGEV_SIGNAL; evt.sigev_signo = (intptr_t) TASK_DATA(t) + SIGRTMIN; - evt.sigev_value.sival_ptr = TASK_DATA(t); + evt.sigev_value.sival_ptr = t; if (timer_create(CLOCK_MONOTONIC, &evt, &tmr) == -1) { if (TASK_ROOT(t)->root_hooks.hook_exec.exception) @@ -1456,6 +1583,7 @@ sched_hook_rtc(void *task, void *arg __unused) } else TASK_FLAG(t) = (u_long) tmr; +#if SUP_ENABLE == KQ_SUPPORT if (!(sigt = schedSignal(TASK_ROOT(t), _sched_rtcWrapper, TASK_ARG(t), evt.sigev_signo, t, (size_t) tmr))) { if (TASK_ROOT(t)->root_hooks.hook_exec.exception) @@ -1466,7 +1594,22 @@ sched_hook_rtc(void *task, void *arg __unused) return (void*) -1; } else TASK_RET(t) = (uintptr_t) sigt; +#else + memset(&sa, 0, sizeof sa); + sigemptyset(&sa.sa_mask); + sa.sa_sigaction = _sched_rtcSigWrapper; + sa.sa_flags = SA_SIGINFO | SA_RESTART; + if (sigaction(evt.sigev_signo, &sa, NULL) == -1) { + if (TASK_ROOT(t)->root_hooks.hook_exec.exception) + TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); + else + LOGERR; + timer_delete(tmr); + return (void*) -1; + } +#endif + memset(&its, 0, sizeof its); its.it_value.tv_sec = t->task_val.ts.tv_sec; its.it_value.tv_nsec = t->task_val.ts.tv_nsec; @@ -1480,7 +1623,6 @@ sched_hook_rtc(void *task, void *arg __unused) timer_delete(tmr); return (void*) -1; } - +#endif /* HAVE_TIMER_CREATE */ return NULL; } -#endif /* HAVE_TIMER_CREATE */