--- libaitsched/src/hooks.c	2022/10/19 01:45:08	1.37
+++ libaitsched/src/hooks.c	2022/12/20 22:40:32	1.39
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.37 2022/10/19 01:45:08 misho Exp $
+* $Id: hooks.c,v 1.39 2022/12/20 22:40:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -156,9 +156,11 @@ sched_hook_init(void *root, void *arg __unused)
 	}
 #else
 	r->root_kq ^= r->root_kq;
+#endif
+
 	FD_ZERO(&r->root_fds[0]);
 	FD_ZERO(&r->root_fds[1]);
-#endif
+	FD_ZERO(&r->root_fds[2]);
 
 	return NULL;
 }
@@ -184,11 +186,13 @@ sched_hook_fini(void *root, void *arg __unused)
 		r->root_kq = 0;
 	}
 #else
-	FD_ZERO(&r->root_fds[1]);
-	FD_ZERO(&r->root_fds[0]);
 	r->root_kq ^= r->root_kq;
 #endif
 
+	FD_ZERO(&r->root_fds[2]);
+	FD_ZERO(&r->root_fds[1]);
+	FD_ZERO(&r->root_fds[0]);
+
 	return NULL;
 }
 
@@ -209,7 +213,7 @@ sched_hook_cancel(void *task, void *arg __unused)
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
 #elif SUP_ENABLE == EP_SUPPORT
-	struct epoll_event ee = { .events = 0, .data.fd = 0 };
+	struct epoll_event ee = { .events = 0, .data.u64 = 0l };
 #else
 	register int i;
 #endif
@@ -244,19 +248,27 @@ sched_hook_cancel(void *task, void *arg __unused)
 			ee.data.fd = TASK_FD(t);
 			ee.events ^= ee.events;
 			if (FD_ISSET(TASK_FD(t), &r->root_fds[1]))
-				ee.events = EPOLLOUT;
+				ee.events |= EPOLLOUT;
 
-			if (flg < 2)
+			if (flg < 2) {
 				FD_CLR(TASK_FD(t), &r->root_fds[0]);
-			else
-				ee.events |= EPOLLIN | EPOLLPRI;
+				FD_CLR(TASK_FD(t), &r->root_fds[2]);
+			} else {
+				if (FD_ISSET(TASK_FD(t), &r->root_fds[0]))
+					ee.events |= EPOLLIN;
+				if (FD_ISSET(TASK_FD(t), &r->root_fds[2]))
+					ee.events |= EPOLLPRI;
+			}
 #else
 			if (flg < 2) {
 				FD_CLR(TASK_FD(t), &r->root_fds[0]);
+				FD_CLR(TASK_FD(t), &r->root_fds[2]);
 
 				/* optimize select */
 				for (i = r->root_kq - 1; i >= 0; i--)
-					if (FD_ISSET(i, &r->root_fds[0]) || FD_ISSET(i, &r->root_fds[1]))
+					if (FD_ISSET(i, &r->root_fds[0]) || 
+							FD_ISSET(i, &r->root_fds[1]) || 
+							FD_ISSET(i, &r->root_fds[2]))
 						break;
 				r->root_kq = i + 1;
 			}
@@ -279,7 +291,9 @@ sched_hook_cancel(void *task, void *arg __unused)
 			ee.data.fd = TASK_FD(t);
 			ee.events ^= ee.events;
 			if (FD_ISSET(TASK_FD(t), &r->root_fds[0]))
-				ee.events = EPOLLIN | EPOLLPRI;
+				ee.events |= EPOLLIN;
+			if (FD_ISSET(TASK_FD(t), &r->root_fds[2]))
+				ee.events |= EPOLLPRI;
 
 			if (flg < 2)
 				FD_CLR(TASK_FD(t), &r->root_fds[1]);
@@ -291,7 +305,9 @@ sched_hook_cancel(void *task, void *arg __unused)
 
 				/* optimize select */
 				for (i = r->root_kq - 1; i >= 0; i--)
-					if (FD_ISSET(i, &r->root_fds[0]) || FD_ISSET(i, &r->root_fds[1]))
+					if (FD_ISSET(i, &r->root_fds[0]) || 
+							FD_ISSET(i, &r->root_fds[1]) || 
+							FD_ISSET(i, &r->root_fds[2]))
 						break;
 				r->root_kq = i + 1;
 			}
@@ -517,15 +533,16 @@ sched_hook_thread(void *task, void *arg)
  * return: <0 errors and 0 ok
  */
 void *
-sched_hook_read(void *task, void *arg __unused)
+sched_hook_read(void *task, void *arg)
 {
 	sched_task_t *t = task;
 	sched_root_task_t *r = NULL;
+	uintptr_t mask = (uintptr_t) arg;
 #if SUP_ENABLE == KQ_SUPPORT
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
 #elif SUP_ENABLE == EP_SUPPORT
-	struct epoll_event ee;
+	struct epoll_event ee = { 0 };
 	int flg = 0;
 #endif
 
@@ -536,9 +553,11 @@ sched_hook_read(void *task, void *arg __unused)
 
 #if SUP_ENABLE == KQ_SUPPORT
 #ifdef __NetBSD__
-	EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_FD(t));
+	EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR | mask, 
+			0, 0, (intptr_t) TASK_FD(t));
 #else
-	EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_FD(t));
+	EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR | mask, 
+			0, 0, (void*) TASK_FD(t));
 #endif
 	if (kevent(r->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		if (r->root_hooks.hook_exec.exception)
@@ -548,10 +567,18 @@ sched_hook_read(void *task, void *arg __unused)
 		return (void*) -1;
 	}
 #elif SUP_ENABLE == EP_SUPPORT
+	if (!mask)
+		mask = EPOLLIN | EPOLLPRI;
 	ee.data.fd = TASK_FD(t);
-	ee.events = EPOLLIN | EPOLLPRI;
-	if (FD_ISSET(TASK_FD(t), &r->root_fds[0]))
+	ee.events = mask;
+	if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) {
+		flg |= 4;
+		ee.events |= EPOLLPRI;
+	}
+	if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) {
 		flg |= 1;
+		ee.events |= EPOLLIN;
+	}
 	if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) {
 		flg |= 2;
 		ee.events |= EPOLLOUT;
@@ -563,10 +590,23 @@ sched_hook_read(void *task, void *arg __unused)
 		else
 			LOGERR;
 		return (void*) -1;
-	} else
-		FD_SET(TASK_FD(t), &r->root_fds[0]);
+	} else {
+		if (mask & EPOLLIN)
+			FD_SET(TASK_FD(t), &r->root_fds[0]);
+		if (mask & EPOLLPRI)
+			FD_SET(TASK_FD(t), &r->root_fds[2]);
+	}
 #else
-	FD_SET(TASK_FD(t), &r->root_fds[0]);
+	if (!mask) {
+		FD_SET(TASK_FD(t), &r->root_fds[0]);
+		FD_SET(TASK_FD(t), &r->root_fds[2]);
+	} else {
+		if (mask & 1)
+			FD_SET(TASK_FD(t), &r->root_fds[0]);
+		if (mask & 2)
+			FD_SET(TASK_FD(t), &r->root_fds[2]);
+	}
+
 	if (TASK_FD(t) >= r->root_kq)
 		r->root_kq = TASK_FD(t) + 1;
 #endif
@@ -582,15 +622,16 @@ sched_hook_read(void *task, void *arg __unused)
  * return: <0 errors and 0 ok
  */
 void *
-sched_hook_write(void *task, void *arg __unused)
+sched_hook_write(void *task, void *arg)
 {
 	sched_task_t *t = task;
 	sched_root_task_t *r = NULL;
+	uintptr_t mask = (uintptr_t) arg;
 #if SUP_ENABLE == KQ_SUPPORT
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
 #elif SUP_ENABLE == EP_SUPPORT
-	struct epoll_event ee;
+	struct epoll_event ee = { 0 };
 	int flg = 0;
 #endif
 
@@ -601,9 +642,11 @@ sched_hook_write(void *task, void *arg __unused)
 
 #if SUP_ENABLE == KQ_SUPPORT
 #ifdef __NetBSD__
-	EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_FD(t));
+	EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR | mask, 
+			0, 0, (intptr_t) TASK_FD(t));
 #else
-	EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_FD(t));
+	EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR | mask, 
+			0, 0, (void*) TASK_FD(t));
 #endif
 	if (kevent(r->root_kq, chg, 1, NULL, 0, &timeout) == -1) {
 		if (r->root_hooks.hook_exec.exception)
@@ -613,15 +656,22 @@ sched_hook_write(void *task, void *arg __unused)
 		return (void*) -1;
 	}
 #elif SUP_ENABLE == EP_SUPPORT
+	if (!mask)
+		mask = EPOLLOUT;
 	ee.data.fd = TASK_FD(t);
-	ee.events = EPOLLOUT;
+	ee.events = mask;
 
+	if (FD_ISSET(TASK_FD(t), &r->root_fds[2])) {
+		flg |= 4;
+		ee.events |= EPOLLPRI;
+	}
 	if (FD_ISSET(TASK_FD(t), &r->root_fds[0])) {
 		flg |= 1;
-		ee.events |= EPOLLIN | EPOLLPRI;
+		ee.events |= EPOLLIN;
 	}
 	if (FD_ISSET(TASK_FD(t), &r->root_fds[1])) {
 		flg |= 2;
+		ee.events |= EPOLLOUT;
 	}
 
 	if (epoll_ctl(r->root_kq, flg ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, TASK_FD(t), &ee) == -1) {
@@ -631,9 +681,15 @@ sched_hook_write(void *task, void *arg __unused)
 			LOGERR;
 		return (void*) -1;
 	} else
-		FD_SET(TASK_FD(t), &r->root_fds[1]);
+		if (mask & EPOLLOUT)
+			FD_SET(TASK_FD(t), &r->root_fds[1]);
 #else
-	FD_SET(TASK_FD(t), &r->root_fds[1]);
+	if (!mask)
+		FD_SET(TASK_FD(t), &r->root_fds[1]);
+	else
+		if (mask & 1)
+			FD_SET(TASK_FD(t), &r->root_fds[1]);
+
 	if (TASK_FD(t) >= r->root_kq)
 		r->root_kq = TASK_FD(t) + 1;
 #endif
@@ -1107,10 +1163,15 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r
 					evt->events |= EPOLLOUT;
 					wflg = 42;
 				}
-				if (rflg > 1)
-					evt->events |= EPOLLIN | EPOLLPRI;
-				else
+				if (rflg > 1) {
+					if (FD_ISSET(evt->data.fd, &r->root_fds[0]))
+						evt->events |= EPOLLIN;
+					if (FD_ISSET(evt->data.fd, &r->root_fds[2]))
+						evt->events |= EPOLLPRI;
+				} else {
 					FD_CLR(evt->data.fd, &r->root_fds[0]);
+					FD_CLR(evt->data.fd, &r->root_fds[2]);
+				}
 			}
 		}
 		if (res[i].events & EPOLLOUT) {
@@ -1142,10 +1203,14 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r
 					insert_task_to(task, &r->root_ready);
 				}
 
-				if (!(res[i].events & (EPOLLIN | EPOLLPRI)) && FD_ISSET(evt->data.fd, &r->root_fds[0])) {
-					evt->events |= EPOLLIN | EPOLLPRI;
+				if (!(res[i].events & EPOLLIN) && FD_ISSET(evt->data.fd, &r->root_fds[0])) {
+					evt->events |= EPOLLIN;
 					rflg = 42;
 				}
+				if (!(res[i].events & EPOLLPRI) && FD_ISSET(evt->data.fd, &r->root_fds[2])) {
+					evt->events |= EPOLLPRI;
+					rflg = 42;
+				}
 				if (wflg > 1)
 					evt->events |= EPOLLOUT;
 				else
@@ -1153,6 +1218,7 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r
 			}
 		}
 
+		ops = EPOLL_CTL_DEL;
 		if (rflg > 1 || wflg > 1)
 			ops = EPOLL_CTL_MOD;
 
@@ -1178,7 +1244,9 @@ fetch_hook_select_proceed(int en, fd_set rfd, fd_set w
 		return;
 
 	for (i = 0; i < r->root_kq; i++) {
-		if (!FD_ISSET(i, &r->root_fds[0]) && !FD_ISSET(i, &r->root_fds[1]))
+		if (!FD_ISSET(i, &r->root_fds[0]) && 
+				!FD_ISSET(i, &r->root_fds[1]) && 
+				!FD_ISSET(i, &r->root_fds[2]))
 			continue;
 
 		rflg = wflg = 0;
@@ -1213,8 +1281,10 @@ fetch_hook_select_proceed(int en, fd_set rfd, fd_set w
 				}
 
 				/* remove resouce */
-				if (rflg == 1)
+				if (rflg == 1) {
 					FD_CLR(i, &r->root_fds[0]);
+					FD_CLR(i, &r->root_fds[2]);
+				}
 			}
 		}
 		if (FD_ISSET(i, &wfd)) {
@@ -1255,7 +1325,9 @@ fetch_hook_select_proceed(int en, fd_set rfd, fd_set w
 
 	/* optimize select */
 	for (i = r->root_kq - 1; i >= 0; i--)
-		if (FD_ISSET(i, &r->root_fds[0]) || FD_ISSET(i, &r->root_fds[1]))
+		if (FD_ISSET(i, &r->root_fds[0]) || 
+				FD_ISSET(i, &r->root_fds[1]) || 
+				FD_ISSET(i, &r->root_fds[2]))
 			break;
 	r->root_kq = i + 1;
 }
@@ -1367,7 +1439,8 @@ sched_hook_fetch(void *root, void *arg __unused)
 #elif SUP_ENABLE == EP_SUPPORT
 	if ((en = epoll_wait(r->root_kq, res, KQ_EVENTS, timeout)) == -1) {
 #else
-	rfd = xfd = r->root_fds[0];
+	xfd = r->root_fds[2];
+	rfd = r->root_fds[0];
 	wfd = r->root_fds[1];
 	if ((en = select(r->root_kq, &rfd, &wfd, &xfd, timeout)) == -1) {
 #endif	/* KQ_SUPPORT */