--- libaitsched/src/hooks.c	2023/02/23 17:13:01	1.39.4.1
+++ libaitsched/src/hooks.c	2023/02/25 15:46:15	1.39.4.2
@@ -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.39.4.2 2023/02/25 15:46:15 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -366,8 +366,11 @@ sched_hook_cancel(void *task, void *arg __unused)
 			if (flg < 2)
 				signal(TASK_VAL(t), SIG_DFL);
 #else
-			if (flg < 2)
+			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);
+			}
 #endif
 			break;
 #ifdef AIO_SUPPORT
@@ -842,7 +845,9 @@ sched_hook_signal(void *task, void *arg __unused)
 		return (void*) -1;
 	}
 #else
+	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);
 #endif
 
 	return NULL;
@@ -1343,7 +1348,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;
@@ -1406,13 +1411,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))