--- libaitsched/src/hooks.c 2012/01/24 14:51:03 1.3.4.3 +++ libaitsched/src/hooks.c 2012/05/30 08:51:49 1.6.4.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.3.4.3 2012/01/24 14:51:03 misho Exp $ +* $Id: hooks.c,v 1.6.4.3 2012/05/30 08:51:49 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,27 +49,19 @@ 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; @@ -81,6 +73,7 @@ sched_hook_init(void *root, void *data) /* * sched_hook_fini() - Default FINI hook + * * @root = root task * @arg = unused * return: <0 errors and 0 ok @@ -98,17 +91,12 @@ 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; } /* * sched_hook_cancel() - Default CANCEL hook + * * @task = current task * @arg = unused * return: <0 errors and 0 ok @@ -116,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: @@ -134,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__ @@ -143,8 +127,17 @@ 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; + case taskALARM: +#ifdef __NetBSD__ + EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_DELETE, + 0, 0, (intptr_t) TASK_DATA(t)); +#else + EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_DELETE, + 0, 0, (void*) TASK_DATA(t)); +#endif + kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); + break; default: break; } @@ -154,6 +147,7 @@ sched_hook_cancel(void *task, void *arg __unused) /* * sched_hook_read() - Default READ hook + * * @task = current task * @arg = unused * return: <0 errors and 0 ok @@ -161,21 +155,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 @@ -194,6 +180,7 @@ sched_hook_read(void *task, void *arg __unused) /* * sched_hook_write() - Default WRITE hook + * * @task = current task * @arg = unused * return: <0 errors and 0 ok @@ -201,21 +188,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 @@ -233,7 +212,45 @@ sched_hook_write(void *task, void *arg __unused) } /* + * sched_hook_alarm() - Default ALARM hook + * + * @task = current task + * @arg = unused + * return: <0 errors and 0 ok + */ +void * +sched_hook_alarm(void *task, void *arg __unused) +{ + sched_task_t *t = task; + struct kevent chg[1]; + struct timespec timeout = { 0, 0 }; + + if (!t || !TASK_ROOT(t)) + return (void*) -1; + +#ifdef __NetBSD__ + EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, + t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, + (intptr_t) TASK_DATA(t)); +#else + EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, + t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, + (void*) TASK_DATA(t)); +#endif + if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -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; + } + + return NULL; +} + +/* * sched_hook_fetch() - Default FETCH hook + * * @root = root task * @arg = unused * return: NULL error or !=NULL fetched task @@ -241,20 +258,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]); @@ -295,41 +310,41 @@ retry: #ifdef TIMER_WITHOUT_SORT clock_gettime(CLOCK_MONOTONIC, &now); - timespecclear(&r->root_wait); + sched_timespecclear(&r->root_wait); TAILQ_FOREACH(task, &r->root_timer, task_node) { - if (!timespecisset(&r->root_wait)) + if (!sched_timespecisset(&r->root_wait)) r->root_wait = TASK_TS(task); - else if (timespeccmp(&TASK_TS(task), &r->root_wait, -) < 0) + 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; - timespecsub(&m, &now, &mtmp); + sched_timespecsub(&m, &now, &mtmp); r->root_wait = mtmp; } else { /* set wait INFTIM */ - r->root_wait.tv_sec = r->root_wait.tv_nsec = -1; + sched_timespecinf(&r->root_wait); } #else if (!TAILQ_FIRST(&r->root_eventlo) && (task = TAILQ_FIRST(&r->root_timer))) { clock_gettime(CLOCK_MONOTONIC, &now); m = TASK_TS(task); - timespecsub(&m, &now, &mtmp); + sched_timespecsub(&m, &now, &mtmp); r->root_wait = mtmp; } else { /* set wait INFTIM */ - r->root_wait.tv_sec = r->root_wait.tv_nsec = -1; + sched_timespecinf(&r->root_wait); } #endif /* if present member of eventLo, set NOWAIT */ if (TAILQ_FIRST(&r->root_eventlo)) - timespecclear(&r->root_wait); + sched_timespecclear(&r->root_wait); if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1) timeout = &r->root_wait; - else if (r->root_poll.tv_sec == -1 && r->root_poll.tv_nsec == -1) + else if (sched_timespecisinf(&r->root_poll)) timeout = NULL; else timeout = &r->root_poll; @@ -337,15 +352,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; @@ -356,13 +365,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 @@ -404,13 +410,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 @@ -451,6 +454,29 @@ retry: break; } 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)) + continue; + /* remove alarm handle */ +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskALARM]); +#endif + TAILQ_REMOVE(&r->root_alarm, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskALARM]); +#endif + task->task_type = taskREADY; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskREADY]); +#endif + TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskREADY]); +#endif + break; + } + break; } if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) { if (r->root_hooks.hook_exec.exception) { @@ -464,8 +490,8 @@ retry: /* timer update & put in ready queue */ clock_gettime(CLOCK_MONOTONIC, &now); - TAILQ_FOREACH(task, &r->root_timer, task_node) - if (timespeccmp(&now, &TASK_TS(task), -) >= 0) { + 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]); #endif @@ -510,8 +536,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 @@ -532,6 +560,7 @@ retry: /* * sched_hook_exception() - Default EXCEPTION hook + * * @root = root task * @arg = custom handling: if arg == EV_EOF or other value; default: arg == NULL log errno * return: <0 errors and 0 ok @@ -541,7 +570,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 ... */ @@ -558,4 +587,22 @@ sched_hook_exception(void *root, void *arg) /* default case! */ LOGERR; return NULL; +} + +/* + * sched_hook_condition() - Default CONDITION hook + * + * @root = root task + * @arg = killState from schedRun() + * return: NULL kill scheduler loop or !=NULL ok + */ +void * +sched_hook_condition(void *root, void *arg) +{ + sched_root_task_t *r = root; + + if (!r) + return NULL; + + return (void*) (r->root_cond - *(intptr_t*) arg); }