--- libaitsched/src/hooks.c	2012/05/31 21:48:01	1.7.2.4
+++ libaitsched/src/hooks.c	2012/08/01 14:11:43	1.10.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.7.2.4 2012/05/31 21:48:01 misho Exp $
+* $Id: hooks.c,v 1.10.2.2 2012/08/01 14:11:43 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -156,6 +156,19 @@ 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
+			if (TASK_VAL(t)) {
+				free((void*) TASK_VAL(t));
+				TASK_VAL(t) = 0;
+			}
+			break;
+#endif
 #ifdef EVFILT_USER
 		case taskUSER:
 #ifdef __NetBSD__
@@ -163,8 +176,8 @@ sched_hook_cancel(void *task, void *arg __unused)
 #else
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
-#endif
 			break;
+#endif
 		default:
 			return NULL;
 	}
@@ -433,8 +446,11 @@ 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;
+#ifdef EVFILT_AIO
+	struct aiocb *acb;
+#endif
 
 	if (!r)
 		return NULL;
@@ -535,9 +551,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]);
@@ -576,13 +595,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]);
@@ -621,13 +645,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]);
@@ -644,15 +673,19 @@ 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 {
-						TASK_DATA(task) = (void*) res[i].data;
+						flg++;
+						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
 						TASK_DATLEN(task) = res[i].fflags;
 					}
 					/* remove node handle */
@@ -671,15 +704,19 @@ 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 {
-						TASK_DATA(task) = (void*) res[i].data;
+						flg++;
+						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
 						TASK_DATLEN(task) = res[i].fflags;
 					}
 					/* remove proc handle */
@@ -698,13 +735,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]);
@@ -721,15 +763,51 @@ 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_AIO
+			case EVFILT_AIO:
+				flg = 0;
+				acb = (struct aiocb*) TASK_VAL(task);
+				TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) {
+					if (acb != ((struct aiocb*) res[i].ident) || 
+							acb->aio_sigevent.sigev_value.sival_ptr != res[i].udata)
+						continue;
+					else
+						flg++;
+					/* remove user handle */
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_lock(&r->root_mtx[taskAIO]);
+#endif
+					TAILQ_REMOVE(&r->root_aio, task, task_node);
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_unlock(&r->root_mtx[taskAIO]);
+#endif
+					task->task_type = taskREADY;
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_lock(&r->root_mtx[taskREADY]);
+#endif
+					TAILQ_INSERT_TAIL(&r->root_ready, task, task_node);
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
+#endif
+				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
+				break;
+#endif	/* EVFILT_AIO */
 #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;
 					}
@@ -749,10 +827,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
+#endif	/* EVFILT_USER */
 		}
 		if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) {
 			if (r->root_hooks.hook_exec.exception) {