--- libaitsched/src/hooks.c 2017/09/04 08:47:43 1.32 +++ libaitsched/src/hooks.c 2021/06/08 21:45:07 1.35 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.32 2017/09/04 08:47:43 misho Exp $ +* $Id: hooks.c,v 1.35 2021/06/08 21:45:07 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 - 2017 +Copyright 2004 - 2021 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -713,16 +713,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; @@ -730,11 +731,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) @@ -866,7 +867,7 @@ static inline void fetch_hook_kevent_proceed(int en, struct kevent *res, sched_root_task_t *r) { struct kevent evt[1]; - register int i; + register int i, flg; sched_task_t *task, *tmp; struct timespec now = { 0, 0 }; #ifdef AIO_SUPPORT @@ -884,102 +885,115 @@ 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: TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) { if (TASK_FD(task) == ((intptr_t) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; + if (!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); + /* 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); + 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); } - break; + flg++; } } break; case EVFILT_WRITE: TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) { if (TASK_FD(task) == ((intptr_t) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; + if (!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); + /* 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); + 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); } - break; + flg++; } } break; case EVFILT_TIMER: TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) { if ((uintptr_t) TASK_DATA(task) == ((uintptr_t) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; + 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); - break; + /* remove alarm handle */ + transit_task2ready(task, &r->root_alarm); + } + flg++; } } break; case EVFILT_VNODE: TAILQ_FOREACH_SAFE(task, &r->root_node, task_node, tmp) { if (TASK_FD(task) == ((intptr_t) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; + 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); - break; + /* remove node handle */ + transit_task2ready(task, &r->root_node); + } + flg++; } } break; case EVFILT_PROC: TAILQ_FOREACH_SAFE(task, &r->root_proc, task_node, tmp) { if (TASK_VAL(task) == ((uintptr_t) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; + 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); - break; + /* remove proc handle */ + transit_task2ready(task, &r->root_proc); + } + flg++; } } break; case EVFILT_SIGNAL: TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) { if (TASK_VAL(task) == ((uintptr_t) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; + 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); - break; + /* remove signal handle */ + transit_task2ready(task, &r->root_signal); + } + flg++; } } break; @@ -988,22 +1002,24 @@ fetch_hook_kevent_proceed(int en, struct kevent *res, TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) { acb = (struct aiocb*) TASK_VAL(task); if (acb == ((struct aiocb*) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; - - /* remove user handle */ - transit_task2ready(task, &r->root_aio); + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; - fd = acb->aio_fildes; - if ((len = aio_return(acb)) != -1) { - if (lseek(fd, acb->aio_offset + len, SEEK_CUR) == -1) + /* 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; - } else - LOGERR; - free(acb); - TASK_DATLEN(task) = (u_long) len; - TASK_FD(task) = fd; - break; + free(acb); + TASK_DATLEN(task) = (u_long) len; + TASK_FD(task) = fd; + } + flg++; } } break; @@ -1012,29 +1028,31 @@ fetch_hook_kevent_proceed(int en, struct kevent *res, TAILQ_FOREACH_SAFE(task, &r->root_lio, task_node, tmp) { acbs = (struct aiocb**) TASK_VAL(task); if (acbs == ((struct aiocb**) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; + if (!flg) { + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = (u_long) res[i].fflags; - /* remove user handle */ - transit_task2ready(task, &r->root_lio); + /* remove user handle */ + transit_task2ready(task, &r->root_lio); - 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; - free(acbs[i]); - } - free(acbs); - TASK_DATLEN(task) = (u_long) len; - TASK_FD(task) = fd; + 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; + free(acbs[i]); + } + free(acbs); + TASK_DATLEN(task) = (u_long) len; + TASK_FD(task) = fd; - if (lseek(fd, off + len, SEEK_CUR) == -1) - LOGERR; - break; + if (lseek(fd, off + len, SEEK_CUR) == -1) + LOGERR; + } + flg++; } } break; @@ -1044,18 +1062,23 @@ fetch_hook_kevent_proceed(int en, struct kevent *res, case EVFILT_USER: TAILQ_FOREACH_SAFE(task, &r->root_user, task_node, tmp) { if (TASK_VAL(task) == ((uintptr_t) res[i].udata)) { - TASK_RET(task) = res[i].data; - TASK_FLAG(task) = (u_long) res[i].fflags; + 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); - break; + /* remove user handle */ + transit_task2ready(task, &r->root_user); + } + flg++; } } 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); @@ -1300,39 +1323,41 @@ 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); + 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); + 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) {