--- libaitsched/src/hooks.c 2011/08/11 12:56:53 1.1.1.1.2.2 +++ libaitsched/src/hooks.c 2011/08/11 13:23:28 1.1.1.1.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.1.1.1.2.2 2011/08/11 12:56:53 misho Exp $ +* $Id: hooks.c,v 1.1.1.1.2.3 2011/08/11 13:23:28 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -129,18 +129,34 @@ sched_hook_cancel(void *task, void *arg __unused) switch (t->task_type) { 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)); +#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, 1, NULL, 0, &timeout); FD_CLR(TASK_FD(t), &io->rfd); break; 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)); +#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, 1, NULL, 0, &timeout); FD_CLR(TASK_FD(t), &io->wfd); @@ -176,7 +192,11 @@ sched_hook_read(void *task, void *arg __unused) else 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)); +#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) { LOGERR; return (void*) -1; @@ -209,7 +229,11 @@ sched_hook_write(void *task, void *arg __unused) else 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)); +#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) { LOGERR; return (void*) -1;