version 1.1.1.1.2.4, 2011/08/11 22:55:28
|
version 1.1.1.1.2.5, 2011/08/12 11:49:50
|
Line 118 sched_hook_cancel(void *task, void *arg __unused)
|
Line 118 sched_hook_cancel(void *task, void *arg __unused)
|
{ |
{ |
struct sched_IO *io; |
struct sched_IO *io; |
sched_task_t *t = task; |
sched_task_t *t = task; |
struct kevent chg[2]; | struct kevent chg[1]; |
struct timespec timeout = { 0, 0 }; |
struct timespec timeout = { 0, 0 }; |
|
|
if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) |
if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root)) |
Line 129 sched_hook_cancel(void *task, void *arg __unused)
|
Line 129 sched_hook_cancel(void *task, void *arg __unused)
|
switch (t->task_type) { |
switch (t->task_type) { |
case taskREAD: |
case taskREAD: |
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
EV_SET(&chg[1], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); |
#else |
#else |
EV_SET(&chg[1], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, &TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, &TASK_FD(t)); |
#endif |
#endif |
if (FD_ISSET(TASK_FD(t), &io->wfd)) | kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); |
#ifdef __NetBSD__ | |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t)); | |
#else | |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, &TASK_FD(t)); | |
#endif | |
else | |
#ifdef __NetBSD__ | |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); | |
#else | |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, &TASK_FD(t)); | |
#endif | |
kevent(t->task_root->root_kq, chg, 2, NULL, 0, &timeout); | |
| |
FD_CLR(TASK_FD(t), &io->rfd); |
FD_CLR(TASK_FD(t), &io->rfd); |
break; |
break; |
case taskWRITE: |
case taskWRITE: |
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
EV_SET(&chg[1], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); |
#else |
#else |
EV_SET(&chg[1], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, &TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, &TASK_FD(t)); |
#endif |
#endif |
if (FD_ISSET(TASK_FD(t), &io->rfd)) | kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); |
#ifdef __NetBSD__ | |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t)); | |
#else | |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, &TASK_FD(t)); | |
#endif | |
else | |
#ifdef __NetBSD__ | |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); | |
#else | |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, &TASK_FD(t)); | |
#endif | |
kevent(t->task_root->root_kq, chg, 2, NULL, 0, &timeout); | |
| |
FD_CLR(TASK_FD(t), &io->wfd); |
FD_CLR(TASK_FD(t), &io->wfd); |
break; |
break; |
default: |
default: |