--- libaitsched/src/hooks.c	2011/08/05 15:52:00	1.1
+++ libaitsched/src/hooks.c	2011/10/04 12:34:33	1.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.1 2011/08/05 15:52:00 misho Exp $
+* $Id: hooks.c,v 1.2 2011/10/04 12:34:33 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -119,31 +119,30 @@ sched_hook_cancel(void *task, void *arg __unused)
 	struct sched_IO *io;
 	sched_task_t *t = task;
 	struct kevent chg[1];
-	struct timespec timeout;
+	struct timespec timeout = { 0, 0 };
 
 	if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root))
 		return (void*) -1;
 	else
 		io = ROOT_DATA(t->task_root);
 
-	timespecclear(&timeout);
 	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, &TASK_FD(t));
-			else
-				EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, &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, (void*) 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, &TASK_FD(t));
-			else
-				EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, &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, (void*) TASK_FD(t));
+#endif
 			kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout);
-
 			FD_CLR(TASK_FD(t), &io->wfd);
 			break;
 		default:
@@ -165,7 +164,7 @@ sched_hook_read(void *task, void *arg __unused)
 	struct sched_IO *io;
 	sched_task_t *t = task;
 	struct kevent chg[1];
-	struct timespec timeout;
+	struct timespec timeout = { 0, 0 };
 
 	if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root))
 		return (void*) -1;
@@ -177,8 +176,11 @@ sched_hook_read(void *task, void *arg __unused)
 	else
 		FD_SET(TASK_FD(t), &io->rfd);
 
-	timespecclear(&timeout);
-	EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, &TASK_FD(t));
+#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, (void*) TASK_FD(t));
+#endif
 	if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		LOGERR;
 		return (void*) -1;
@@ -199,7 +201,7 @@ sched_hook_write(void *task, void *arg __unused)
 	struct sched_IO *io;
 	sched_task_t *t = task;
 	struct kevent chg[1];
-	struct timespec timeout;
+	struct timespec timeout = { 0, 0 };
 
 	if (!t || !t->task_root || !ROOT_DATA(t->task_root) || !ROOT_DATLEN(t->task_root))
 		return (void*) -1;
@@ -211,8 +213,11 @@ sched_hook_write(void *task, void *arg __unused)
 	else
 		FD_SET(TASK_FD(t), &io->wfd);
 
-	timespecclear(&timeout);
-	EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, &TASK_FD(t));
+#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, (void*) TASK_FD(t));
+#endif
 	if (kevent(t->task_root->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		LOGERR;
 		return (void*) -1;
@@ -304,10 +309,16 @@ 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
 	}
 
-	timespecclear(&nw);
+	nw.tv_sec = nw.tv_nsec = 0;
 	/* Go and catch the cat into pipes ... */
 	for (i = 0; i < en; i++) {
 		memcpy(evt, &res[i], sizeof evt);
@@ -316,39 +327,48 @@ retry:
 		switch (res[i].filter) {
 			case EVFILT_READ:
 				TAILQ_FOREACH(task, &r->root_read, task_node) {
-					if (TASK_FD(task) != *((int*) res[i].udata))
+					if (TASK_FD(task) != ((int) res[i].udata))
 						continue;
 					/* remove read handle */
 					io = ROOT_DATA(task->task_root);
 					FD_CLR(TASK_FD(task), &io->rfd);
 
 					TAILQ_REMOVE(&r->root_read, task, task_node);
-					task->task_type = taskREADY;
-					TAILQ_INSERT_TAIL(&r->root_ready, task, task_node);
+/*					if (res[i].flags & EV_EOF) {
+						task->task_type = taskUNUSE;
+						TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node);
+					} else { */
+						task->task_type = taskREADY;
+						TAILQ_INSERT_TAIL(&r->root_ready, task, task_node);
+/*					} */
 					break;
 				}
 				break;
 			case EVFILT_WRITE:
 				TAILQ_FOREACH(task, &r->root_write, task_node) {
-					if (TASK_FD(task) != *((int*) res[i].udata))
+					if (TASK_FD(task) != ((int) res[i].udata))
 						continue;
 					/* remove write handle */
 					io = ROOT_DATA(task->task_root);
 					FD_CLR(TASK_FD(task), &io->wfd);
 
 					TAILQ_REMOVE(&r->root_write, task, task_node);
-					task->task_type = taskREADY;
-					TAILQ_INSERT_TAIL(&r->root_ready, task, task_node);
+/*					if (res[i].flags & EV_EOF) {
+						task->task_type = taskUNUSE;
+						TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node);
+					} else { */
+						task->task_type = taskREADY;
+						TAILQ_INSERT_TAIL(&r->root_ready, task, task_node);
+/*					} */
 					break;
 				}
 				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;
@@ -382,4 +402,3 @@ retry:
 	TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node);
 	return task;
 }
-