--- libaitsched/src/hooks.c 2012/05/31 21:48:01 1.7.2.4 +++ libaitsched/src/hooks.c 2012/08/02 13:45:02 1.10.2.11 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.7.2.4 2012/05/31 21:48:01 misho Exp $ +* $Id: hooks.c,v 1.10.2.11 2012/08/02 13:45:02 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -107,6 +107,13 @@ sched_hook_cancel(void *task, void *arg __unused) sched_task_t *t = task; struct kevent chg[1]; struct timespec timeout = { 0, 0 }; +#ifdef AIO_SUPPORT + struct aiocb *acb; +#ifdef EVFILT_LIO + struct aiocb **acbs; + register int i; +#endif /* EVFILT_LIO */ +#endif /* AIO_SUPPORT */ if (!t || !TASK_ROOT(t)) return (void*) -1; @@ -156,6 +163,41 @@ 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 AIO_SUPPORT + case taskAIO: +#ifdef __NetBSD__ + EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t)); +#else + EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); +#endif + acb = (struct aiocb*) TASK_VAL(t); + if (acb) { + if (aio_cancel(acb->aio_fildes, acb) == AIO_CANCELED) + aio_return(acb); + free(acb); + TASK_VAL(t) = 0; + } + break; +#ifdef EVFILT_LIO + case taskLIO: +#ifdef __NetBSD__ + EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t)); +#else + EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); +#endif + acbs = (struct aiocb**) TASK_VAL(t); + if (acbs) { + for (i = 0; i < TASK_DATLEN(t); i++) { + if (aio_cancel(acbs[i]->aio_fildes, acbs[i]) == AIO_CANCELED) + aio_return(acbs[i]); + free(acbs[i]); + } + free(acbs); + TASK_VAL(t) = 0; + } + break; +#endif /* EVFILT_LIO */ +#endif /* AIO_SUPPORT */ #ifdef EVFILT_USER case taskUSER: #ifdef __NetBSD__ @@ -163,8 +205,8 @@ sched_hook_cancel(void *task, void *arg __unused) #else EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); #endif -#endif break; +#endif default: return NULL; } @@ -433,8 +475,19 @@ 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; +#ifdef AIO_SUPPORT + int len, fd; + struct aiocb *acb; +#ifdef EVFILT_LIO + int l; + register int j; + off_t off; + struct aiocb **acbs; + struct iovec *iv; +#endif /* EVFILT_LIO */ +#endif /* AIO_SUPPORT */ if (!r) return NULL; @@ -535,9 +588,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]); @@ -576,13 +632,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]); @@ -621,13 +682,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]); @@ -644,15 +710,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 */ @@ -671,15 +741,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 */ @@ -698,13 +772,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]); @@ -721,15 +800,106 @@ 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 AIO_SUPPORT + case EVFILT_AIO: + flg = 0; + TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) { + acb = (struct aiocb*) TASK_VAL(task); + if (acb != ((struct aiocb*) res[i].udata)) + continue; + else + flg++; + /* remove user handle */ +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskAIO]); +#endif + TAILQ_REMOVE(&r->root_aio, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskAIO]); +#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 + fd = acb->aio_fildes; + if ((len = aio_return(acb)) != -1) { + if (lseek(fd, acb->aio_offset + len, SEEK_CUR) == -1) + LOGERR; + } else + LOGERR; + free(acb); + TASK_DATLEN(task) = (u_long) len; + TASK_FD(task) = fd; + } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; + break; +#ifdef EVFILT_LIO + case EVFILT_LIO: + flg = 0; + TAILQ_FOREACH_SAFE(task, &r->root_lio, task_node, tmp) { + acbs = (struct aiocb**) TASK_VAL(task); + if (acbs != ((struct aiocb**) res[i].udata)) + continue; + else + flg++; + /* remove user handle */ +#ifdef HAVE_LIBPTHREAD + pthread_mutex_lock(&r->root_mtx[taskLIO]); +#endif + TAILQ_REMOVE(&r->root_lio, task, task_node); +#ifdef HAVE_LIBPTHREAD + pthread_mutex_unlock(&r->root_mtx[taskLIO]); +#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 + iv = (struct iovec*) TASK_DATA(task); + fd = acbs[0]->aio_fildes; + off = acbs[0]->aio_offset; + for (j = len = 0; i < TASK_DATLEN(task); len += l, i++) { + if ((iv[i].iov_len = aio_return(acbs[i])) == -1) + l = 0; + else + l = iv[i].iov_len; + free(acbs[i]); + } + free(acbs); + TASK_DATLEN(task) = (u_long) len; + TASK_FD(task) = fd; + + if (lseek(fd, off + len, SEEK_CUR) == -1) + LOGERR; + } + /* if match at least 2, don't remove resouce of event */ + if (flg > 1) + evt->flags ^= evt->flags; + break; +#endif /* EVFILT_LIO */ +#endif /* AIO_SUPPORT */ #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; } @@ -749,10 +919,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 +#endif /* EVFILT_USER */ } if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) { if (r->root_hooks.hook_exec.exception) {