--- libaitsched/src/hooks.c 2012/05/31 14:45:10 1.7.2.2 +++ libaitsched/src/hooks.c 2012/06/29 13:52:11 1.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.7.2.2 2012/05/31 14:45:10 misho Exp $ +* $Id: hooks.c,v 1.9 2012/06/29 13:52:11 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -156,15 +156,17 @@ sched_hook_cancel(void *task, void *arg __unused) EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); #endif break; +#ifdef EVFILT_USER case taskUSER: #ifdef __NetBSD__ EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t)); #else EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); #endif +#endif break; default: - return (void*) -1; + return NULL; } kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); @@ -386,6 +388,7 @@ sched_hook_signal(void *task, void *arg __unused) * @arg = unused * return: <0 errors and 0 ok */ +#ifdef EVFILT_USER void * sched_hook_user(void *task, void *arg __unused) { @@ -413,6 +416,7 @@ sched_hook_user(void *task, void *arg __unused) return NULL; } +#endif /* * sched_hook_fetch() - Default FETCH hook @@ -429,7 +433,7 @@ sched_hook_fetch(void *root, void *arg __unused) struct timespec now, m, mtmp; struct timespec *timeout; struct kevent evt[1], res[KQ_EVENTS]; - register int i; + register int i, flg; int en; if (!r) @@ -531,9 +535,12 @@ sched_hook_fetch(void *root, void *arg __unused) /* Put read/write task to ready queue */ switch (res[i].filter) { case EVFILT_READ: + flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) { if (TASK_FD(task) != ((intptr_t) res[i].udata)) continue; + else + flg++; /* remove read handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskREAD]); @@ -572,13 +579,18 @@ sched_hook_fetch(void *root, void *arg __unused) pthread_mutex_unlock(&r->root_mtx[taskREADY]); #endif } - break; } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; break; case EVFILT_WRITE: + flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) { if (TASK_FD(task) != ((intptr_t) res[i].udata)) continue; + else + flg++; /* remove write handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskWRITE]); @@ -617,13 +629,18 @@ sched_hook_fetch(void *root, void *arg __unused) pthread_mutex_unlock(&r->root_mtx[taskREADY]); #endif } - break; } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; break; case EVFILT_TIMER: + flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) { if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata)) continue; + else + flg++; /* remove alarm handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskALARM]); @@ -640,15 +657,19 @@ sched_hook_fetch(void *root, void *arg __unused) #ifdef HAVE_LIBPTHREAD pthread_mutex_unlock(&r->root_mtx[taskREADY]); #endif - break; } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; break; case EVFILT_VNODE: + flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_node, task_node, tmp) { if (TASK_FD(task) != ((intptr_t) res[i].udata)) continue; else { - TASK_DATA(task) = (void*) res[i].data; + flg++; + TASK_DATA(task) = (void*) (uintptr_t) res[i].data; TASK_DATLEN(task) = res[i].fflags; } /* remove node handle */ @@ -667,15 +688,19 @@ sched_hook_fetch(void *root, void *arg __unused) #ifdef HAVE_LIBPTHREAD pthread_mutex_unlock(&r->root_mtx[taskREADY]); #endif - break; } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; break; case EVFILT_PROC: + flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_proc, task_node, tmp) { if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) continue; else { - TASK_DATA(task) = (void*) res[i].data; + flg++; + TASK_DATA(task) = (void*) (uintptr_t) res[i].data; TASK_DATLEN(task) = res[i].fflags; } /* remove proc handle */ @@ -694,13 +719,18 @@ sched_hook_fetch(void *root, void *arg __unused) #ifdef HAVE_LIBPTHREAD pthread_mutex_unlock(&r->root_mtx[taskREADY]); #endif - break; } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; break; case EVFILT_SIGNAL: + flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) { if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) continue; + else + flg++; /* remove signal handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskSIGNAL]); @@ -717,14 +747,19 @@ sched_hook_fetch(void *root, void *arg __unused) #ifdef HAVE_LIBPTHREAD pthread_mutex_unlock(&r->root_mtx[taskREADY]); #endif - break; } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; break; +#ifdef EVFILT_USER case EVFILT_USER: + flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_user, task_node, tmp) { if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) continue; else { + flg++; TASK_DATA(task) = (void*) res[i].data; TASK_DATLEN(task) = res[i].fflags; } @@ -744,9 +779,12 @@ sched_hook_fetch(void *root, void *arg __unused) #ifdef HAVE_LIBPTHREAD pthread_mutex_unlock(&r->root_mtx[taskREADY]); #endif - break; } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; break; +#endif } if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) { if (r->root_hooks.hook_exec.exception) {