--- libaitsched/src/hooks.c 2012/08/23 00:31:41 1.14.2.5 +++ libaitsched/src/hooks.c 2013/08/15 17:58:31 1.18.4.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.14.2.5 2012/08/23 00:31:41 misho Exp $ +* $Id: hooks.c,v 1.18.4.2 2013/08/15 17:58:31 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, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -107,10 +107,10 @@ sched_hook_cancel(void *task, void *arg __unused) sched_task_t *t = task; struct kevent chg[1]; struct timespec timeout = { 0, 0 }; - register int i = 0; #ifdef AIO_SUPPORT struct aiocb *acb; #ifdef EVFILT_LIO + register int i = 0; struct aiocb **acbs; #endif /* EVFILT_LIO */ #endif /* AIO_SUPPORT */ @@ -162,6 +162,8 @@ sched_hook_cancel(void *task, void *arg __unused) #else EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); #endif + /* restore signal */ + signal(TASK_VAL(t), SIG_DFL); break; #ifdef AIO_SUPPORT case taskAIO: @@ -209,17 +211,13 @@ sched_hook_cancel(void *task, void *arg __unused) #endif case taskTHREAD: #ifdef HAVE_LIBPTHREAD - for (i = 0; i < MAX_TASK_MISS; i++) - if (!pthread_cancel((pthread_t) TASK_VAL(t))) { - /* joinable thread */ - if (TASK_FLAG(t) == PTHREAD_CREATE_JOINABLE) - schedTask(TASK_ROOT(t), _sched_threadJoin, - TASK_ARG(t), TASK_VAL(t), - TASK_DATA(t), TASK_DATLEN(t)); - return NULL; - } - return (void*) -1; + pthread_cancel((pthread_t) TASK_VAL(t)); #endif + return NULL; + case taskRTC: + timer_delete((timer_t) TASK_DATLEN(t)); + schedCancel((sched_task_t*) TASK_RET(t)); + return NULL; default: return NULL; } @@ -248,17 +246,17 @@ sched_hook_thread(void *task, void *arg) sigfillset(&s); pthread_sigmask(SIG_BLOCK, &s, &o); - if (pthread_create(&tid, (pthread_attr_t*) arg, - (void *(*)(void*)) TASK_FUNC(t), t)) { + if ((errno = pthread_create(&tid, (pthread_attr_t*) arg, + (void *(*)(void*)) _sched_threadWrapper, t))) { LOGERR; pthread_sigmask(SIG_SETMASK, &o, NULL); return (void*) -1; - } + } else + TASK_VAL(t) = (u_long) tid; if (!TASK_ISLOCKED(t)) TASK_LOCK(t); - TASK_VAL(t) = (u_long) tid; pthread_sigmask(SIG_SETMASK, &o, NULL); return NULL; } @@ -348,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 @@ -456,10 +454,13 @@ sched_hook_signal(void *task, void *arg __unused) if (!t || !TASK_ROOT(t)) return (void*) -1; + /* ignore signal */ + 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) @@ -1120,4 +1121,77 @@ 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 = NULL; + + if (!t || !TASK_ROOT(t)) + return (void*) -1; + + tmr = malloc(sizeof(timer_t)); + if (!tmr) { + 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; + } + + memset(&evt, 0, sizeof evt); + evt.sigev_notify = SIGEV_SIGNAL; + evt.sigev_signo = (int) TASK_DATA(t) + SIGRTMIN; + evt.sigev_value.sival_ptr = tmr; + + if (timer_create((clockid_t) TASK_DATA(t), &evt, evt.sigev_value.sival_ptr) == -1) { + if (TASK_ROOT(t)->root_hooks.hook_exec.exception) + TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); + else + LOGERR; + if (tmr) + free(tmr); + return (void*) -1; + } else + TASK_DATLEN(t) = (size_t) *tmr; + + if (!(sigt = schedSignal(TASK_ROOT(t), TASK_FUNC(t), TASK_ARG(t), evt.sigev_signo, + TASK_DATA(t), TASK_DATLEN(t)))) { + 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); + free(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, 0, &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); + free(tmr); + return (void*) -1; + } + + return NULL; }