--- libaitsched/src/hooks.c	2011/08/12 11:49:50	1.1.1.1.2.5
+++ libaitsched/src/hooks.c	2011/09/30 08:13:41	1.1.1.1.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.1.1.1.2.5 2011/08/12 11:49:50 misho Exp $
+* $Id: hooks.c,v 1.1.1.1.2.8 2011/09/30 08:13:41 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -129,18 +129,18 @@ sched_hook_cancel(void *task, void *arg __unused)
 	switch (t->task_type) {
 		case taskREAD:
 #ifdef __NetBSD__
-			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_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));
+			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:
 #ifdef __NetBSD__
-			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_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));
+			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);
@@ -177,9 +177,9 @@ sched_hook_read(void *task, void *arg __unused)
 		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));
+	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;
@@ -214,9 +214,9 @@ sched_hook_write(void *task, void *arg __unused)
 		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));
+	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;
@@ -309,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;
@@ -321,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;
@@ -387,4 +402,3 @@ retry:
 	TAILQ_INSERT_TAIL(&r->root_unuse, task, task_node);
 	return task;
 }
-