version 1.10.2.1, 2012/08/01 12:49:26
|
version 1.10.2.10, 2012/08/02 12:58:02
|
Line 107 sched_hook_cancel(void *task, void *arg __unused)
|
Line 107 sched_hook_cancel(void *task, void *arg __unused)
|
sched_task_t *t = task; |
sched_task_t *t = task; |
struct kevent chg[1]; |
struct kevent chg[1]; |
struct timespec timeout = { 0, 0 }; |
struct timespec timeout = { 0, 0 }; |
|
#ifdef AIO_SUPPORT |
|
struct aiocb *acb; |
|
#endif /* AIO_SUPPORT */ |
|
|
if (!t || !TASK_ROOT(t)) |
if (!t || !TASK_ROOT(t)) |
return (void*) -1; |
return (void*) -1; |
Line 156 sched_hook_cancel(void *task, void *arg __unused)
|
Line 159 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)); |
EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); |
#endif |
#endif |
break; |
break; |
#ifdef EVFILT_AIO | #ifdef AIO_SUPPORT |
case taskAIO: |
case taskAIO: |
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t)); |
EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t)); |
#else |
#else |
EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); |
EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); |
#endif |
#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; |
break; |
#endif | #endif /* AIO_SUPPORT */ |
#ifdef EVFILT_USER |
#ifdef EVFILT_USER |
case taskUSER: |
case taskUSER: |
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
Line 444 sched_hook_fetch(void *root, void *arg __unused)
|
Line 454 sched_hook_fetch(void *root, void *arg __unused)
|
struct kevent evt[1], res[KQ_EVENTS]; |
struct kevent evt[1], res[KQ_EVENTS]; |
register int i, flg; |
register int i, flg; |
int en; |
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) |
if (!r) |
return NULL; |
return NULL; |
Line 761 sched_hook_fetch(void *root, void *arg __unused)
|
Line 782 sched_hook_fetch(void *root, void *arg __unused)
|
if (flg > 1) |
if (flg > 1) |
evt->flags ^= evt->flags; |
evt->flags ^= evt->flags; |
break; |
break; |
|
#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].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 |
|
#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 |
|
#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_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 /* AIO_SUPPORT */ |
#ifdef EVFILT_USER |
#ifdef EVFILT_USER |
case EVFILT_USER: |
case EVFILT_USER: |
flg = 0; |
flg = 0; |
Line 793 sched_hook_fetch(void *root, void *arg __unused)
|
Line 878 sched_hook_fetch(void *root, void *arg __unused)
|
if (flg > 1) |
if (flg > 1) |
evt->flags ^= evt->flags; |
evt->flags ^= evt->flags; |
break; |
break; |
#endif | #endif /* EVFILT_USER */ |
} |
} |
if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) { |
if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) { |
if (r->root_hooks.hook_exec.exception) { |
if (r->root_hooks.hook_exec.exception) { |