version 1.1.1.1.2.2, 2011/08/11 12:56:53
|
version 1.1.1.1.2.5, 2011/08/12 11:49:50
|
Line 128 sched_hook_cancel(void *task, void *arg __unused)
|
Line 128 sched_hook_cancel(void *task, void *arg __unused)
|
|
|
switch (t->task_type) { |
switch (t->task_type) { |
case taskREAD: |
case taskREAD: |
if (FD_ISSET(TASK_FD(t), &io->wfd)) | #ifdef __NetBSD__ |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 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[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, &TASK_FD(t)); |
| #endif |
kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); |
kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); |
|
|
FD_CLR(TASK_FD(t), &io->rfd); |
FD_CLR(TASK_FD(t), &io->rfd); |
break; |
break; |
case taskWRITE: |
case taskWRITE: |
if (FD_ISSET(TASK_FD(t), &io->rfd)) | #ifdef __NetBSD__ |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 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[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) &TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, &TASK_FD(t)); |
| #endif |
kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); |
kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout); |
|
|
FD_CLR(TASK_FD(t), &io->wfd); |
FD_CLR(TASK_FD(t), &io->wfd); |
break; |
break; |
default: |
default: |
Line 176 sched_hook_read(void *task, void *arg __unused)
|
Line 176 sched_hook_read(void *task, void *arg __unused)
|
else |
else |
FD_SET(TASK_FD(t), &io->rfd); |
FD_SET(TASK_FD(t), &io->rfd); |
|
|
|
#ifdef __NetBSD__ |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t)); |
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 |
if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
LOGERR; |
LOGERR; |
return (void*) -1; |
return (void*) -1; |
Line 209 sched_hook_write(void *task, void *arg __unused)
|
Line 213 sched_hook_write(void *task, void *arg __unused)
|
else |
else |
FD_SET(TASK_FD(t), &io->wfd); |
FD_SET(TASK_FD(t), &io->wfd); |
|
|
|
#ifdef __NetBSD__ |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (intptr_t) &TASK_FD(t)); |
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 |
if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
LOGERR; |
LOGERR; |
return (void*) -1; |
return (void*) -1; |