--- libaitsched/src/hooks.c 2011/08/12 12:12:01 1.1.1.1.2.6 +++ libaitsched/src/hooks.c 2011/10/04 13:29:00 1.2.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.1.1.1.2.6 2011/08/12 12:12:01 misho Exp $ +* $Id: hooks.c,v 1.2.2.1 2011/10/04 13:29:00 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -129,18 +129,18 @@ sched_hook_cancel(void *task, void *arg __unused) switch (t->task_type) { case taskREAD: #ifdef __NetBSD__ - EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t)); #else - EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, &TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (void*) TASK_FD(t)); #endif kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); FD_CLR(TASK_FD(t), &io->rfd); break; case taskWRITE: #ifdef __NetBSD__ - EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t)); #else - EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, &TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (void*) TASK_FD(t)); #endif kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); FD_CLR(TASK_FD(t), &io->wfd); @@ -177,12 +177,13 @@ sched_hook_read(void *task, void *arg __unused) FD_SET(TASK_FD(t), &io->rfd); #ifdef __NetBSD__ - EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (intptr_t) TASK_FD(t)); #else - EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, &TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (void*) TASK_FD(t)); #endif if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) { - LOGERR; + if (t->task_root->root_hooks.hook_exec.exception) + t->task_root->root_hooks.hook_exec.exception(t->task_root, NULL); return (void*) -1; } @@ -214,12 +215,13 @@ sched_hook_write(void *task, void *arg __unused) FD_SET(TASK_FD(t), &io->wfd); #ifdef __NetBSD__ - EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (intptr_t) TASK_FD(t)); #else - EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, &TASK_FD(t)); + EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (void*) TASK_FD(t)); #endif if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) { - LOGERR; + if (t->task_root->root_hooks.hook_exec.exception) + t->task_root->root_hooks.hook_exec.exception(t->task_root, NULL); return (void*) -1; } @@ -308,8 +310,16 @@ retry: } else /* wait INFTIM */ timeout = NULL; if ((en = kevent(r->root_kq, NULL, 0, res, KQ_EVENTS, timeout)) == -1) { - LOGERR; + if (r->root_hooks.hook_exec.exception) + if (r->root_hooks.hook_exec.exception(r, NULL)) + return NULL; /* exit from scheduler */ +#ifdef NDEBUG + /* kevent no exit by error, if non-debug version */ goto retry; +#else + /* diagnostic exit from scheduler if kevent error occur */ + return NULL; +#endif } nw.tv_sec = nw.tv_nsec = 0; @@ -321,35 +331,57 @@ retry: switch (res[i].filter) { case EVFILT_READ: TAILQ_FOREACH(task, &r->root_read, task_node) { - if (TASK_FD(task) != *((int*) res[i].udata)) + if (TASK_FD(task) != ((int) res[i].udata)) continue; /* remove read handle */ io = ROOT_DATA(task->task_root); FD_CLR(TASK_FD(task), &io->rfd); TAILQ_REMOVE(&r->root_read, task, task_node); - task->task_type = taskREADY; - TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); + 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; + TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); + } else { + task->task_type = taskREADY; + TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); + } + } else { + task->task_type = taskREADY; + TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); + } break; } break; case EVFILT_WRITE: TAILQ_FOREACH(task, &r->root_write, task_node) { - if (TASK_FD(task) != *((int*) res[i].udata)) + if (TASK_FD(task) != ((int) res[i].udata)) continue; /* remove write handle */ io = ROOT_DATA(task->task_root); FD_CLR(TASK_FD(task), &io->wfd); TAILQ_REMOVE(&r->root_write, task, task_node); - task->task_type = taskREADY; - TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); + 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; + TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); + } else { + task->task_type = taskREADY; + TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); + } + } else { + task->task_type = taskREADY; + TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); + } break; } break; } if (kevent(r->root_kq, evt, 1, NULL, 0, &nw) == -1) - LOGERR; + if (r->root_hooks.hook_exec.exception) + if (r->root_hooks.hook_exec.exception(r, NULL)) + return NULL; /* exit from scheduler */ } /* timer update & put in ready queue */ @@ -385,4 +417,31 @@ retry: task->task_type = taskUNUSE; TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); return task; +} + +/* + * sched_hook_exception() - Default EXCEPTION hook + * @root = root task + * @arg = may be EV_EOF + * return: <0 errors and 0 ok + */ +void * +sched_hook_exception(void *root, void *arg) +{ + sched_root_task_t *r = root; + + if (!r || !ROOT_DATA(r) || !ROOT_DATLEN(r)) + return NULL; + + if (arg) { + if (arg == (void*) EV_EOF) + return NULL; + return (void*) -1; /* raise error */ + } else + LOGERR; + + if (errno == EINTR) + return (void*) -1; /* raise error */ + + return NULL; }