--- libaitsched/src/hooks.c	2011/08/11 12:56:53	1.1.1.1.2.2
+++ libaitsched/src/hooks.c	2011/09/28 14:14:10	1.1.1.1.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $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.7 2011/09/28 14:14:10 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -128,21 +128,21 @@ sched_hook_cancel(void *task, void *arg __unused)
 
 	switch (t->task_type) {
 		case taskREAD:
-			if (FD_ISSET(TASK_FD(t), &io->wfd))
-				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_DELETE, 0, 0, (intptr_t) &TASK_FD(t));
+#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->rfd);
 			break;
 		case taskWRITE:
-			if (FD_ISSET(TASK_FD(t), &io->rfd))
-				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_DELETE, 0, 0, (intptr_t) &TASK_FD(t));
+#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->wfd);
 			break;
 		default:
@@ -176,7 +176,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 +213,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;
@@ -301,7 +309,13 @@ retry:
 		timeout = NULL;
 	if ((en = kevent(r->root_kq, NULL, 0, res, KQ_EVENTS, timeout)) == -1) {
 		LOGERR;
+#ifdef NDEBUG
+		/* kevent no exit by error, if non-debug version */
 		goto retry;
+#else
+		/* diagnostic exit from scheduler if kevent error occur */
+		return NULL;
+#endif
 	}
 
 	nw.tv_sec = nw.tv_nsec = 0;
@@ -340,12 +354,11 @@ retry:
 				}
 				break;
 		}
-
 		if (kevent(r->root_kq, evt, 1, NULL, 0, &nw) == -1)
 			LOGERR;
 	}
 
-	/* timer update */
+	/* timer update & put in ready queue */
 	clock_gettime(CLOCK_MONOTONIC, &nw);
 	now.tv_sec = nw.tv_sec;
 	now.tv_usec = nw.tv_nsec / 1000;
@@ -379,4 +392,3 @@ retry:
 	TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node);
 	return task;
 }
-