--- libaitsched/src/hooks.c	2011/08/11 22:55:28	1.1.1.1.2.4
+++ 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.4 2011/08/11 22:55:28 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
@@ -118,7 +118,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 {
 	struct sched_IO *io;
 	sched_task_t *t = task;
-	struct kevent chg[2];
+	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
 
 	if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root))
@@ -129,46 +129,20 @@ sched_hook_cancel(void *task, void *arg __unused)
 	switch (t->task_type) {
 		case taskREAD:
 #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
-			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
-			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, 2, NULL, 0, &timeout);
-
+			kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout);
 			FD_CLR(TASK_FD(t), &io->rfd);
 			break;
 		case taskWRITE:
 #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
-			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
-			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, 2, NULL, 0, &timeout);
-
+			kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout);
 			FD_CLR(TASK_FD(t), &io->wfd);
 			break;
 		default:
@@ -335,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;
@@ -374,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;
@@ -413,4 +392,3 @@ retry:
 	TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node);
 	return task;
 }
-