--- libaitsched/src/hooks.c 2012/08/22 23:43:36 1.14.2.3 +++ libaitsched/src/hooks.c 2013/08/26 14:29:20 1.21.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.14.2.3 2012/08/22 23:43:36 misho Exp $ +* $Id: hooks.c,v 1.21.4.1 2013/08/26 14:29:20 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 @@ -110,8 +110,8 @@ sched_hook_cancel(void *task, void *arg __unused) #ifdef AIO_SUPPORT struct aiocb *acb; #ifdef EVFILT_LIO + register int i = 0; struct aiocb **acbs; - register int i; #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: @@ -206,22 +208,18 @@ sched_hook_cancel(void *task, void *arg __unused) EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); #endif break; -#endif +#endif /* EVFILT_USER */ case taskTHREAD: #ifdef HAVE_LIBPTHREAD - /* try to wait for valid thread id */ - for (i = 0; i < MAX_TASK_MISS && - pthread_kill((pthread_t) TASK_VAL(t), 0); i++) - usleep(10); - /* try to sure thread is cancelled */ - for (i = 0; i < MAX_TASK_MISS && - !pthread_kill((pthread_t) TASK_VAL(t), 0); i++) - pthread_cancel((pthread_t) TASK_VAL(t)); - if (TASK_FLAG(t) == PTHREAD_CREATE_JOINABLE) /* joinable thread */ - schedTask(TASK_ROOT(t), _sched_threadJoin, TASK_ARG(t), - TASK_VAL(t), TASK_DATA(t), TASK_DATLEN(t)); + pthread_cancel((pthread_t) TASK_VAL(t)); #endif - TASK_UNLOCK(t); + return NULL; +#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) + case taskRTC: + timer_delete((timer_t) TASK_FLAG(t)); + schedCancel((sched_task_t*) TASK_RET(t)); + return NULL; +#endif /* HAVE_TIMER_CREATE */ default: return NULL; } @@ -243,25 +241,25 @@ sched_hook_thread(void *task, void *arg) { sched_task_t *t = task; pthread_t tid; - sigset_t ns, os; + sigset_t s, o; if (!t || !TASK_ROOT(t)) return (void*) -1; - sigfillset(&ns); - pthread_sigmask(SIG_BLOCK, &ns, &os); - if (pthread_create(&tid, (pthread_attr_t*) arg, - (void *(*)(void*)) TASK_FUNC(t), t)) { + sigfillset(&s); + pthread_sigmask(SIG_BLOCK, &s, &o); + if ((errno = pthread_create(&tid, (pthread_attr_t*) arg, + (void *(*)(void*)) _sched_threadWrapper, t))) { LOGERR; - pthread_sigmask(SIG_SETMASK, &os, NULL); + 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, &os, NULL); + pthread_sigmask(SIG_SETMASK, &o, NULL); return NULL; } #endif @@ -350,11 +348,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 @@ -458,10 +456,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) @@ -646,7 +647,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 @@ -699,7 +700,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 @@ -752,7 +753,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 @@ -783,7 +784,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 @@ -814,7 +815,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 @@ -845,7 +846,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 @@ -878,7 +879,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 @@ -920,7 +921,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 @@ -970,7 +971,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 @@ -1123,3 +1124,68 @@ sched_hook_condition(void *root, void *arg) 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 + */ +#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME) +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 = (intptr_t) TASK_DATA(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), _sched_rtcWrapper, TASK_ARG(t), evt.sigev_signo, + 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; + } + + if (!TASK_ISLOCKED(t)) + TASK_LOCK(t); + + return NULL; +} +#endif /* HAVE_TIMER_CREATE */