--- libaitsched/src/hooks.c 2013/06/03 20:52:53 1.18 +++ libaitsched/src/hooks.c 2013/08/15 18:43:44 1.18.4.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.18 2013/06/03 20:52:53 misho Exp $ +* $Id: hooks.c,v 1.18.4.5 2013/08/15 18:43:44 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -213,6 +213,11 @@ sched_hook_cancel(void *task, void *arg __unused) #ifdef HAVE_LIBPTHREAD pthread_cancel((pthread_t) TASK_VAL(t)); #endif + return NULL; + case taskRTC: + timer_delete((timer_t) TASK_FLAG(t)); + schedCancel((sched_task_t*) TASK_RET(t)); + return NULL; default: return NULL; } @@ -341,11 +346,11 @@ sched_hook_alarm(void *task, void *arg __unused) return (void*) -1; #ifdef __NetBSD__ - EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, + EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_CLEAR, 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, + EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_CLEAR, 0, t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, (void*) TASK_DATA(t)); #endif @@ -453,9 +458,9 @@ sched_hook_signal(void *task, void *arg __unused) signal(TASK_VAL(t), SIG_IGN); #ifdef __NetBSD__ - EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD, 0, 0, (intptr_t) TASK_VAL(t)); + EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_VAL(t)); #else - EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD, 0, 0, (void*) TASK_VAL(t)); + EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_VAL(t)); #endif if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { if (TASK_ROOT(t)->root_hooks.hook_exec.exception) @@ -640,7 +645,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove read handle */ #ifdef HAVE_LIBPTHREAD @@ -693,7 +698,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove write handle */ #ifdef HAVE_LIBPTHREAD @@ -746,7 +751,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove alarm handle */ #ifdef HAVE_LIBPTHREAD @@ -777,7 +782,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove node handle */ #ifdef HAVE_LIBPTHREAD @@ -808,7 +813,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove proc handle */ #ifdef HAVE_LIBPTHREAD @@ -839,7 +844,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove signal handle */ #ifdef HAVE_LIBPTHREAD @@ -872,7 +877,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove user handle */ #ifdef HAVE_LIBPTHREAD @@ -914,7 +919,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove user handle */ #ifdef HAVE_LIBPTHREAD @@ -964,7 +969,7 @@ sched_hook_fetch(void *root, void *arg __unused) else { flg++; TASK_RET(task) = res[i].data; - TASK_FLAG(task) = res[i].fflags; + TASK_FLAG(task) = (u_long) res[i].fflags; } /* remove user handle */ #ifdef HAVE_LIBPTHREAD @@ -1116,4 +1121,64 @@ sched_hook_condition(void *root, void *arg) return NULL; return (void*) (r->root_cond - *(intptr_t*) arg); +} + +/* + * sched_hook_rtc() - Default RTC hook + * + * @task = current task + * @arg = unused + * return: <0 errors and 0 ok + */ +void * +sched_hook_rtc(void *task, void *arg __unused) +{ + sched_task_t *sigt = NULL, *t = task; + struct itimerspec its; + struct sigevent evt; + timer_t tmr; + + if (!t || !TASK_ROOT(t)) + return (void*) -1; + + memset(&evt, 0, sizeof evt); + evt.sigev_notify = SIGEV_SIGNAL; + evt.sigev_signo = TASK_DATLEN(t) + SIGRTMIN; + evt.sigev_value.sival_ptr = TASK_DATA(t); + + if (timer_create(CLOCK_MONOTONIC, &evt, &tmr) == -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; + } else + TASK_FLAG(t) = (u_long) tmr; + + if (!(sigt = schedSignal(TASK_ROOT(t), TASK_FUNC(t), TASK_ARG(t), evt.sigev_signo, + TASK_DATA(t), (size_t) tmr))) { + if (TASK_ROOT(t)->root_hooks.hook_exec.exception) + TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); + else + LOGERR; + timer_delete(tmr); + return (void*) -1; + } else + TASK_RET(t) = (uintptr_t) sigt; + + memset(&its, 0, sizeof its); + its.it_value.tv_sec = t->task_val.ts.tv_sec; + its.it_value.tv_nsec = t->task_val.ts.tv_nsec; + + if (timer_settime(tmr, TIMER_RELTIME, &its, NULL) == -1) { + if (TASK_ROOT(t)->root_hooks.hook_exec.exception) + TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); + else + LOGERR; + schedCancel(sigt); + timer_delete(tmr); + return (void*) -1; + } + + return NULL; }