--- libaitsched/src/hooks.c 2011/10/04 12:34:33 1.2 +++ libaitsched/src/hooks.c 2012/03/13 10:01:59 1.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.2 2011/10/04 12:34:33 misho Exp $ +* $Id: hooks.c,v 1.5 2012/03/13 10:01:59 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,6 +49,7 @@ SUCH DAMAGE. /* * sched_hook_init() - Default INIT hook + * * @root = root task * @data = optional data if !=NULL * return: <0 errors and 0 ok @@ -81,6 +82,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 @@ -109,6 +111,7 @@ sched_hook_fini(void *root, void *arg __unused) /* * sched_hook_cancel() - Default CANCEL hook + * * @task = current task * @arg = unused * return: <0 errors and 0 ok @@ -121,19 +124,19 @@ sched_hook_cancel(void *task, void *arg __unused) struct kevent chg[1]; struct timespec timeout = { 0, 0 }; - if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) + if (!t || !TASK_ROOT(t) || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) return (void*) -1; else io = ROOT_DATA(t->task_root); - switch (t->task_type) { + switch (TASK_TYPE(t)) { case taskREAD: #ifdef __NetBSD__ 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, (void*) TASK_FD(t)); #endif - kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); + kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); FD_CLR(TASK_FD(t), &io->rfd); break; case taskWRITE: @@ -142,7 +145,7 @@ sched_hook_cancel(void *task, void *arg __unused) #else 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); + kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); FD_CLR(TASK_FD(t), &io->wfd); break; default: @@ -154,6 +157,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 @@ -166,7 +170,7 @@ sched_hook_read(void *task, void *arg __unused) struct kevent chg[1]; struct timespec timeout = { 0, 0 }; - if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) + if (!t || !TASK_ROOT(t) || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) return (void*) -1; else io = ROOT_DATA(t->task_root); @@ -181,8 +185,11 @@ sched_hook_read(void *task, void *arg __unused) #else 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 (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; } @@ -191,6 +198,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 @@ -203,7 +211,7 @@ sched_hook_write(void *task, void *arg __unused) struct kevent chg[1]; struct timespec timeout = { 0, 0 }; - if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) + if (!t || !TASK_ROOT(t) || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) return (void*) -1; else io = ROOT_DATA(t->task_root); @@ -218,8 +226,11 @@ sched_hook_write(void *task, void *arg __unused) #else 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 (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; } @@ -228,6 +239,7 @@ sched_hook_write(void *task, void *arg __unused) /* * sched_hook_fetch() - Default FETCH hook + * * @root = root task * @arg = unused * return: NULL error or !=NULL fetched task @@ -238,8 +250,8 @@ sched_hook_fetch(void *root, void *arg __unused) struct sched_IO *io; sched_root_task_t *r = root; sched_task_t *task; - struct timeval now, m, mtmp; - struct timespec nw, *timeout; + struct timespec now, m, mtmp; + struct timespec *timeout; struct kevent evt[1], res[KQ_EVENTS]; register int i; int en; @@ -250,65 +262,89 @@ sched_hook_fetch(void *root, void *arg __unused) /* get new task by queue priority */ retry: while ((task = TAILQ_FIRST(&r->root_event))) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskEVENT]); +#endif TAILQ_REMOVE(&r->root_event, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskEVENT]); +#endif task->task_type = taskUNUSE; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskUNUSE]); +#endif TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskUNUSE]); +#endif return task; } while ((task = TAILQ_FIRST(&r->root_ready))) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskREADY]); +#endif TAILQ_REMOVE(&r->root_ready, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskREADY]); +#endif task->task_type = taskUNUSE; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskUNUSE]); +#endif TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskUNUSE]); +#endif return task; } #ifdef TIMER_WITHOUT_SORT - clock_gettime(CLOCK_MONOTONIC, &nw); - now.tv_sec = nw.tv_sec; - now.tv_usec = nw.tv_nsec / 1000; + clock_gettime(CLOCK_MONOTONIC, &now); - timerclear(&r->root_wait); + sched_timespecclear(&r->root_wait); TAILQ_FOREACH(task, &r->root_timer, task_node) { - if (!timerisset(&r->root_wait)) - r->root_wait = TASK_TV(task); - else if (timercmp(&TASK_TV(task), &r->root_wait, -) < 0) - r->root_wait = TASK_TV(task); + 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; - timersub(&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_usec = -1; + sched_timespecinf(&r->root_wait); } #else if (!TAILQ_FIRST(&r->root_eventlo) && (task = TAILQ_FIRST(&r->root_timer))) { - clock_gettime(CLOCK_MONOTONIC, &nw); - now.tv_sec = nw.tv_sec; - now.tv_usec = nw.tv_nsec / 1000; + clock_gettime(CLOCK_MONOTONIC, &now); - m = TASK_TV(task); - timersub(&m, &now, &mtmp); + m = TASK_TS(task); + sched_timespecsub(&m, &now, &mtmp); r->root_wait = mtmp; } else { /* set wait INFTIM */ - r->root_wait.tv_sec = r->root_wait.tv_usec = -1; + sched_timespecinf(&r->root_wait); } #endif /* if present member of eventLo, set NOWAIT */ if (TAILQ_FIRST(&r->root_eventlo)) - timerclear(&r->root_wait); + sched_timespecclear(&r->root_wait); - if (r->root_wait.tv_sec != -1 && r->root_wait.tv_usec != -1) { - nw.tv_sec = r->root_wait.tv_sec; - nw.tv_nsec = r->root_wait.tv_usec * 1000; - timeout = &nw; - } else /* wait INFTIM */ + if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1) + timeout = &r->root_wait; + else if (sched_timespecisinf(&r->root_poll)) timeout = NULL; + else + timeout = &r->root_poll; 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; + } else + LOGERR; #ifdef NDEBUG /* kevent no exit by error, if non-debug version */ goto retry; @@ -318,7 +354,7 @@ retry: #endif } - nw.tv_sec = nw.tv_nsec = 0; + now.tv_sec = now.tv_nsec = 0; /* Go and catch the cat into pipes ... */ for (i = 0; i < en; i++) { memcpy(evt, &res[i], sizeof evt); @@ -327,57 +363,130 @@ 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) != ((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 TAILQ_REMOVE(&r->root_read, task, task_node); -/* if (res[i].flags & EV_EOF) { - task->task_type = taskUNUSE; - TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); - } else { */ +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskREAD]); +#endif + 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; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskUNUSE]); +#endif + TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskUNUSE]); +#endif + } else { + 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 + } + } else { 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; case EVFILT_WRITE: TAILQ_FOREACH(task, &r->root_write, task_node) { - if (TASK_FD(task) != ((int) res[i].udata)) + 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 TAILQ_REMOVE(&r->root_write, task, task_node); -/* if (res[i].flags & EV_EOF) { - task->task_type = taskUNUSE; - TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); - } else { */ +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskWRITE]); +#endif + 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; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskUNUSE]); +#endif + TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskUNUSE]); +#endif + } else { + 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 + } + } else { 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, &nw) == -1) - LOGERR; + if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) { + if (r->root_hooks.hook_exec.exception) { + if (r->root_hooks.hook_exec.exception(r, NULL)) + return NULL; + } else + LOGERR; + } } /* timer update & put in ready queue */ - clock_gettime(CLOCK_MONOTONIC, &nw); - now.tv_sec = nw.tv_sec; - now.tv_usec = nw.tv_nsec / 1000; + clock_gettime(CLOCK_MONOTONIC, &now); TAILQ_FOREACH(task, &r->root_timer, task_node) - if (timercmp(&now, &TASK_TV(task), -) >= 0) { + if (sched_timespeccmp(&now, &TASK_TS(task), -) >= 0) { +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskTIMER]); +#endif TAILQ_REMOVE(&r->root_timer, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskTIMER]); +#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 } /* put eventlo priority task to ready queue, if there is no ready task or @@ -386,9 +495,21 @@ retry: if (!TAILQ_FIRST(&r->root_ready) || r->root_eventlo_miss > MAX_EVENTLO_MISS) { r->root_eventlo_miss = 0; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskEVENTLO]); +#endif TAILQ_REMOVE(&r->root_eventlo, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskEVENTLO]); +#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 } else r->root_eventlo_miss++; } else @@ -397,8 +518,69 @@ retry: /* OK, lets get ready task !!! */ if (!(task = TAILQ_FIRST(&r->root_ready))) goto retry; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskREADY]); +#endif TAILQ_REMOVE(&r->root_ready, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskREADY]); +#endif task->task_type = taskUNUSE; +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskUNUSE]); +#endif TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskUNUSE]); +#endif return task; +} + +/* + * 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 + */ +void * +sched_hook_exception(void *root, void *arg) +{ + sched_root_task_t *r = root; + + if (!r || !ROOT_DATA(r) || !ROOT_DATLEN(r)) + return NULL; + + /* custom exception handling ... */ + if (arg) { + if (arg == (void*) EV_EOF) + return NULL; + return (void*) -1; /* raise scheduler error!!! */ + } + + /* if error hook exists */ + if (r->root_hooks.hook_root.error) + return (r->root_hooks.hook_root.error(root, (void*) ((intptr_t) errno))); + + /* 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 || !ROOT_DATA(r) || !ROOT_DATLEN(r)) + return NULL; + + return (void*) (r->root_cond - *(intptr_t*) arg); }