--- libaitsched/src/hooks.c 2012/03/13 10:01:59 1.5 +++ libaitsched/src/hooks.c 2012/05/10 15:30:18 1.5.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.5 2012/03/13 10:01:59 misho Exp $ +* $Id: hooks.c,v 1.5.2.4 2012/05/10 15:30:18 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -51,26 +51,17 @@ SUCH DAMAGE. * sched_hook_init() - Default INIT hook * * @root = root task - * @data = optional data if !=NULL + * @arg = unused * return: <0 errors and 0 ok */ void * -sched_hook_init(void *root, void *data) +sched_hook_init(void *root, void *arg __unused) { sched_root_task_t *r = root; - if (!r || r->root_data.iov_base || r->root_data.iov_len) + if (!r) return (void*) -1; - r->root_data.iov_base = malloc(sizeof(struct sched_IO)); - if (!r->root_data.iov_base) { - LOGERR; - return (void*) -1; - } else { - r->root_data.iov_len = sizeof(struct sched_IO); - memset(r->root_data.iov_base, 0, r->root_data.iov_len); - } - r->root_kq = kqueue(); if (r->root_kq == -1) { LOGERR; @@ -100,12 +91,6 @@ sched_hook_fini(void *root, void *arg __unused) r->root_kq = 0; } - if (r->root_data.iov_base && r->root_data.iov_len) { - free(r->root_data.iov_base); - r->root_data.iov_base = NULL; - r->root_data.iov_len = 0; - } - return NULL; } @@ -119,15 +104,12 @@ sched_hook_fini(void *root, void *arg __unused) void * sched_hook_cancel(void *task, void *arg __unused) { - struct sched_IO *io; sched_task_t *t = task; struct kevent chg[1]; struct timespec timeout = { 0, 0 }; - if (!t || !TASK_ROOT(t) || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) + if (!t || !TASK_ROOT(t)) return (void*) -1; - else - io = ROOT_DATA(t->task_root); switch (TASK_TYPE(t)) { case taskREAD: @@ -137,7 +119,6 @@ sched_hook_cancel(void *task, void *arg __unused) EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (void*) TASK_FD(t)); #endif kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); - FD_CLR(TASK_FD(t), &io->rfd); break; case taskWRITE: #ifdef __NetBSD__ @@ -146,7 +127,6 @@ sched_hook_cancel(void *task, void *arg __unused) EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (void*) TASK_FD(t)); #endif kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); - FD_CLR(TASK_FD(t), &io->wfd); break; default: break; @@ -165,21 +145,13 @@ sched_hook_cancel(void *task, void *arg __unused) void * sched_hook_read(void *task, void *arg __unused) { - struct sched_IO *io; sched_task_t *t = task; struct kevent chg[1]; struct timespec timeout = { 0, 0 }; - if (!t || !TASK_ROOT(t) || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) + if (!t || !TASK_ROOT(t)) return (void*) -1; - else - io = ROOT_DATA(t->task_root); - if (FD_ISSET(TASK_FD(t), &io->rfd)) - return NULL; - else - 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)); #else @@ -206,21 +178,13 @@ sched_hook_read(void *task, void *arg __unused) void * sched_hook_write(void *task, void *arg __unused) { - struct sched_IO *io; sched_task_t *t = task; struct kevent chg[1]; struct timespec timeout = { 0, 0 }; - if (!t || !TASK_ROOT(t) || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) + if (!t || !TASK_ROOT(t)) return (void*) -1; - else - io = ROOT_DATA(t->task_root); - if (FD_ISSET(TASK_FD(t), &io->wfd)) - return NULL; - else - 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)); #else @@ -247,20 +211,18 @@ sched_hook_write(void *task, void *arg __unused) void * sched_hook_fetch(void *root, void *arg __unused) { - struct sched_IO *io; sched_root_task_t *r = root; - sched_task_t *task; + sched_task_t *task, *tmp; struct timespec now, m, mtmp; struct timespec *timeout; struct kevent evt[1], res[KQ_EVENTS]; register int i; int en; - if (!r || !ROOT_DATA(r) || !ROOT_DATLEN(r)) + if (!r) return NULL; /* get new task by queue priority */ -retry: while ((task = TAILQ_FIRST(&r->root_event))) { #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskEVENT]); @@ -343,15 +305,9 @@ retry: if (r->root_hooks.hook_exec.exception) { if (r->root_hooks.hook_exec.exception(r, NULL)) return NULL; - } else + } else if (errno != EINTR) LOGERR; -#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 } now.tv_sec = now.tv_nsec = 0; @@ -362,13 +318,10 @@ retry: /* Put read/write task to ready queue */ switch (res[i].filter) { case EVFILT_READ: - TAILQ_FOREACH(task, &r->root_read, task_node) { + TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) { if (TASK_FD(task) != ((intptr_t) res[i].udata)) continue; /* remove read handle */ - io = ROOT_DATA(task->task_root); - FD_CLR(TASK_FD(task), &io->rfd); - #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskREAD]); #endif @@ -410,13 +363,10 @@ retry: } break; case EVFILT_WRITE: - TAILQ_FOREACH(task, &r->root_write, task_node) { + TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) { if (TASK_FD(task) != ((intptr_t) res[i].udata)) continue; /* remove write handle */ - io = ROOT_DATA(task->task_root); - FD_CLR(TASK_FD(task), &io->wfd); - #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskWRITE]); #endif @@ -470,7 +420,7 @@ retry: /* timer update & put in ready queue */ clock_gettime(CLOCK_MONOTONIC, &now); - TAILQ_FOREACH(task, &r->root_timer, task_node) + TAILQ_FOREACH_SAFE(task, &r->root_timer, task_node, tmp) if (sched_timespeccmp(&now, &TASK_TS(task), -) >= 0) { #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskTIMER]); @@ -516,8 +466,10 @@ retry: r->root_eventlo_miss = 0; /* OK, lets get ready task !!! */ - if (!(task = TAILQ_FIRST(&r->root_ready))) - goto retry; + task = TAILQ_FIRST(&r->root_ready); + if (!(task)) + return NULL; + #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskREADY]); #endif @@ -548,7 +500,7 @@ sched_hook_exception(void *root, void *arg) { sched_root_task_t *r = root; - if (!r || !ROOT_DATA(r) || !ROOT_DATLEN(r)) + if (!r) return NULL; /* custom exception handling ... */ @@ -579,7 +531,7 @@ sched_hook_condition(void *root, void *arg) { sched_root_task_t *r = root; - if (!r || !ROOT_DATA(r) || !ROOT_DATLEN(r)) + if (!r) return NULL; return (void*) (r->root_cond - *(intptr_t*) arg);