--- libaitsched/src/hooks.c	2012/05/31 14:17:59	1.7.2.1
+++ libaitsched/src/hooks.c	2012/08/01 12:49:26	1.10.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.7.2.1 2012/05/31 14:17:59 misho Exp $
+* $Id: hooks.c,v 1.10.2.1 2012/08/01 12:49:26 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -156,6 +156,16 @@ sched_hook_cancel(void *task, void *arg __unused)
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
 			break;
+#ifdef EVFILT_AIO
+		case taskAIO:
+#ifdef __NetBSD__
+			EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
+#else
+			EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
+#endif
+			break;
+#endif
+#ifdef EVFILT_USER
 		case taskUSER:
 #ifdef __NetBSD__
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
@@ -163,8 +173,9 @@ sched_hook_cancel(void *task, void *arg __unused)
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
 			break;
+#endif
 		default:
-			return (void*) -1;
+			return NULL;
 	}
 
 	kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout);
@@ -386,6 +397,7 @@ sched_hook_signal(void *task, void *arg __unused)
  * @arg = unused
  * return: <0 errors and 0 ok
  */
+#ifdef EVFILT_USER
 void *
 sched_hook_user(void *task, void *arg __unused)
 {
@@ -397,9 +409,11 @@ sched_hook_user(void *task, void *arg __unused)
 		return (void*) -1;
 
 #ifdef __NetBSD__
-	EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_ADD | EV_CLEAR, NOTE_FFNOP, 0, (intptr_t) TASK_VAL(t));
+	EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_ADD | EV_CLEAR, TASK_DATLEN(t), 
+			0, (intptr_t) TASK_VAL(t));
 #else
-	EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_ADD | EV_CLEAR, NOTE_FFNOP, 0, (void*) TASK_VAL(t));
+	EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_ADD | EV_CLEAR, TASK_DATLEN(t), 
+			0, (void*) TASK_VAL(t));
 #endif
 	if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		if (TASK_ROOT(t)->root_hooks.hook_exec.exception)
@@ -411,6 +425,7 @@ sched_hook_user(void *task, void *arg __unused)
 
 	return NULL;
 }
+#endif
 
 /*
  * sched_hook_fetch() - Default FETCH hook
@@ -427,7 +442,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 	struct timespec now, m, mtmp;
 	struct timespec *timeout;
 	struct kevent evt[1], res[KQ_EVENTS];
-	register int i;
+	register int i, flg;
 	int en;
 
 	if (!r)
@@ -529,9 +544,12 @@ sched_hook_fetch(void *root, void *arg __unused)
 		/* Put read/write task to ready queue */
 		switch (res[i].filter) {
 			case EVFILT_READ:
+				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
+					else
+						flg++;
 					/* remove read handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskREAD]);
@@ -570,13 +588,18 @@ sched_hook_fetch(void *root, void *arg __unused)
 						pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
 					}
-					break;
 				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
 				break;
 			case EVFILT_WRITE:
+				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
+					else
+						flg++;
 					/* remove write handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskWRITE]);
@@ -615,13 +638,18 @@ sched_hook_fetch(void *root, void *arg __unused)
 						pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
 					}
-					break;
 				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
 				break;
 			case EVFILT_TIMER:
+				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) {
 					if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata))
 						continue;
+					else
+						flg++;
 					/* remove alarm handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskALARM]);
@@ -638,13 +666,21 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
-					break;
 				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
 				break;
 			case EVFILT_VNODE:
+				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_node, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
+					else {
+						flg++;
+						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
+						TASK_DATLEN(task) = res[i].fflags;
+					}
 					/* remove node handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskNODE]);
@@ -661,13 +697,21 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
-					break;
 				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
 				break;
 			case EVFILT_PROC:
+				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_proc, task_node, tmp) {
 					if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
 						continue;
+					else {
+						flg++;
+						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
+						TASK_DATLEN(task) = res[i].fflags;
+					}
 					/* remove proc handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskPROC]);
@@ -684,13 +728,18 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
-					break;
 				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
 				break;
 			case EVFILT_SIGNAL:
+				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) {
 					if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
 						continue;
+					else
+						flg++;
 					/* remove signal handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskSIGNAL]);
@@ -707,13 +756,22 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
-					break;
 				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
 				break;
+#ifdef EVFILT_USER
 			case EVFILT_USER:
+				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_user, task_node, tmp) {
 					if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
 						continue;
+					else {
+						flg++;
+						TASK_DATA(task) = (void*) res[i].data;
+						TASK_DATLEN(task) = res[i].fflags;
+					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskUSER]);
@@ -730,9 +788,12 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
-					break;
 				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
 				break;
+#endif
 		}
 		if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) {
 			if (r->root_hooks.hook_exec.exception) {