--- libaitsched/src/hooks.c	2023/02/23 17:13:01	1.39.4.1
+++ libaitsched/src/hooks.c	2023/08/17 14:14:24	1.42
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.39.4.1 2023/02/23 17:13:01 misho Exp $
+* $Id: hooks.c,v 1.42 2023/08/17 14:14:24 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -362,13 +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);
-#else
-			if (flg < 2)
-				sigdelset(&TASK_ROOT(t)->root_sigset, TASK_VAL(t));
 #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:
@@ -818,17 +817,15 @@ void *
 sched_hook_signal(void *task, void *arg __unused)
 {
 	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
@@ -841,10 +838,12 @@ sched_hook_signal(void *task, void *arg __unused)
 			LOGERR;
 		return (void*) -1;
 	}
-#else
-	sigaddset(&TASK_ROOT(t)->root_sigset, TASK_VAL(t));
 #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;
 }
 
@@ -1343,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;
@@ -1386,7 +1385,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 		if (TAILQ_FIRST(&r->root_timer)) {
 			m = r->root_wait;
 			sched_timespecsub(&m, &now, &mtmp);
-			r->root_wait = mtmp;
+			if (mtmp.tv_sec < 0 || mtmp.tv_nsec < 0)
+				/* don't wait for events. we have ready timer */
+				sched_timespecclear(&r->root_wait);
+			else
+				r->root_wait = mtmp;
 		} else {
 			/* set wait INFTIM */
 			sched_timespecinf(&r->root_wait);
@@ -1397,7 +1400,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 
 			m = TASK_TS(task);
 			sched_timespecsub(&m, &now, &mtmp);
-			r->root_wait = mtmp;
+			if (mtmp.tv_sec < 0 || mtmp.tv_nsec < 0)
+				/* don't wait for events. we have ready timer */
+				sched_timespecclear(&r->root_wait);
+			else
+				r->root_wait = mtmp;
 		} else {
 			/* set wait INFTIM */
 			sched_timespecinf(&r->root_wait);
@@ -1406,13 +1413,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))