--- libaitsched/src/hooks.c 2012/08/01 15:17:38 1.10.2.5 +++ libaitsched/src/hooks.c 2012/08/02 12:58:02 1.10.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.10.2.5 2012/08/01 15:17:38 misho Exp $ +* $Id: hooks.c,v 1.10.2.10 2012/08/02 12:58:02 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -107,9 +107,9 @@ sched_hook_cancel(void *task, void *arg __unused) sched_task_t *t = task; struct kevent chg[1]; struct timespec timeout = { 0, 0 }; -#ifdef EVFILT_AIO +#ifdef AIO_SUPPORT struct aiocb *acb; -#endif +#endif /* AIO_SUPPORT */ if (!t || !TASK_ROOT(t)) return (void*) -1; @@ -159,7 +159,7 @@ 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_AIO +#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)); @@ -168,12 +168,13 @@ sched_hook_cancel(void *task, void *arg __unused) #endif acb = (struct aiocb*) TASK_VAL(t); if (acb) { - aio_cancel(acb->aio_fildes, acb); + if (aio_cancel(acb->aio_fildes, acb) == AIO_CANCELED) + aio_return(acb); free(acb); TASK_VAL(t) = 0; } break; -#endif +#endif /* AIO_SUPPORT */ #ifdef EVFILT_USER case taskUSER: #ifdef __NetBSD__ @@ -453,10 +454,17 @@ sched_hook_fetch(void *root, void *arg __unused) struct kevent evt[1], res[KQ_EVENTS]; register int i, flg; int en; -#ifdef EVFILT_AIO +#ifdef AIO_SUPPORT int len, fd; struct aiocb *acb; -#endif +#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; @@ -774,13 +782,15 @@ sched_hook_fetch(void *root, void *arg __unused) if (flg > 1) evt->flags ^= evt->flags; break; -#ifdef EVFILT_AIO +#ifdef AIO_SUPPORT case EVFILT_AIO: +#ifdef EVFILT_LIO + case EVFILT_LIO: +#endif /* EVFILT_LIO */ flg = 0; TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) { acb = (struct aiocb*) TASK_VAL(task); - if (acb != ((struct aiocb*) res[i].ident) || - acb->aio_sigevent.sigev_value.sival_ptr != res[i].udata) + if (acb != ((struct aiocb*) res[i].udata)) continue; else flg++; @@ -800,22 +810,42 @@ sched_hook_fetch(void *root, void *arg __unused) #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) +#ifdef EVFILT_LIO + if (res[i].filter == EVFILT_LIO) { + acbs = (struct aiocb**) TASK_VAL(task); + 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); + if (lseek(fd, off + len, SEEK_CUR) == -1) LOGERR; } else - LOGERR; +#endif /* EVFILT_LIO */ + { + 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_FD(task) = (u_long) fd; + 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; -#endif /* EVFILT_AIO */ +#endif /* AIO_SUPPORT */ #ifdef EVFILT_USER case EVFILT_USER: flg = 0;