--- libaitsched/src/hooks.c	2022/11/29 20:15:18	1.38
+++ libaitsched/src/hooks.c	2023/07/27 20:51:28	1.41
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.38 2022/11/29 20:15:18 misho Exp $
+* $Id: hooks.c,v 1.41 2023/07/27 20:51:28 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2022
+Copyright 2004 - 2023
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,15 +47,6 @@ SUCH DAMAGE.
 #include "hooks.h"
 
 
-static inline void
-transit_task2ready(sched_task_t * __restrict t, sched_queue_t * __restrict q)
-{
-	remove_task_from(t, q);
-
-	t->task_type = taskREADY;
-	insert_task_to(t, &(TASK_ROOT(t))->root_ready);
-}
-
 #ifdef HAVE_LIBPTHREAD
 static void *
 _sched_threadWrapper(sched_task_t *t)
@@ -213,7 +204,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
@@ -359,11 +350,11 @@ sched_hook_cancel(void *task, void *arg __unused)
 #endif
 			break;
 		case taskSIGNAL:
-#if SUP_ENABLE == KQ_SUPPORT
 			/* check for multi subscribers */
 			TAILQ_FOREACH_SAFE(tt, &r->root_signal, task_node, tmp)
 				if (TASK_VAL(tt) == TASK_VAL(t))
 					flg++;
+#if SUP_ENABLE == KQ_SUPPORT
 #ifdef __NetBSD__
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, flg < 2 ? EV_DELETE : 0, 
 					0, 0, (intptr_t) TASK_VAL(t));
@@ -371,10 +362,12 @@ sched_hook_cancel(void *task, void *arg __unused)
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, flg < 2 ? EV_DELETE : 0, 
 					0, 0, (void*) TASK_VAL(t));
 #endif
-			/* restore signal */
-			if (flg < 2)
-				signal(TASK_VAL(t), SIG_DFL);
 #endif
+			if (flg < 2) {
+				pthread_mutex_lock(&TASK_ROOT(t)->root_sigmtx);
+				sigdelset(&TASK_ROOT(t)->root_sigset, TASK_VAL(t));
+				pthread_mutex_unlock(&TASK_ROOT(t)->root_sigmtx);
+			}
 			break;
 #ifdef AIO_SUPPORT
 		case taskAIO:
@@ -542,7 +535,7 @@ sched_hook_read(void *task, void *arg)
 	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
 
@@ -631,7 +624,7 @@ sched_hook_write(void *task, void *arg)
 	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
 
@@ -823,17 +816,16 @@ sched_hook_proc(void *task, void *arg __unused)
 void *
 sched_hook_signal(void *task, void *arg __unused)
 {
-#if SUP_ENABLE == KQ_SUPPORT
 	sched_task_t *t = task;
+#if SUP_ENABLE == KQ_SUPPORT
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
+#endif
 
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
 
-	/* ignore signal */
-	signal(TASK_VAL(t), SIG_IGN);
-
+#if SUP_ENABLE == KQ_SUPPORT
 #ifdef __NetBSD__
 	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_VAL(t));
 #else
@@ -847,6 +839,11 @@ sched_hook_signal(void *task, void *arg __unused)
 		return (void*) -1;
 	}
 #endif
+
+	pthread_mutex_lock(&TASK_ROOT(t)->root_sigmtx);
+	sigaddset(&TASK_ROOT(t)->root_sigset, TASK_VAL(t));
+	pthread_mutex_unlock(&TASK_ROOT(t)->root_sigmtx);
+
 	return NULL;
 }
 
@@ -1218,6 +1215,7 @@ fetch_hook_epoll_proceed(int en, struct epoll_event *r
 			}
 		}
 
+		ops = EPOLL_CTL_DEL;
 		if (rflg > 1 || wflg > 1)
 			ops = EPOLL_CTL_MOD;
 
@@ -1344,7 +1342,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 {
 	sched_root_task_t *r = root;
 	sched_task_t *task, *tmp;
-	struct timespec now, m, mtmp;
+	struct timespec now, m, mtmp, *tsmin;
 #if SUP_ENABLE == KQ_SUPPORT
 	struct kevent res[KQ_EVENTS];
 	struct timespec *timeout;
@@ -1407,13 +1405,14 @@ sched_hook_fetch(void *root, void *arg __unused)
 	} else	/* no waiting for event, because we have ready task */
 		sched_timespecclear(&r->root_wait);
 
-	if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1) {
+	if (!sched_timespecisinf(&r->root_wait)) {
+		tsmin = sched_timespecmin(&r->root_wait, &r->root_poll);
 #if SUP_ENABLE == KQ_SUPPORT
-		timeout = &r->root_wait;
+		timeout = tsmin;
 #elif SUP_ENABLE == EP_SUPPORT
-		timeout = r->root_wait.tv_sec * 1000 + r->root_wait.tv_nsec / 1000000;
+		timeout = tsmin->tv_sec * 1000 + tsmin->tv_nsec / 1000000;
 #else
-		sched_timespec2val(&r->root_wait, &tv);
+		sched_timespec2val(tsmin, &tv);
 		timeout = &tv;
 #endif	/* KQ_SUPPORT */
 	} else if (sched_timespecisinf(&r->root_poll))