--- libaitsched/src/aitsched.c	2023/08/31 15:25:59	1.34.2.1
+++ libaitsched/src/aitsched.c	2024/02/26 12:58:55	1.36
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.34.2.1 2023/08/31 15:25:59 misho Exp $
+* $Id: aitsched.c,v 1.36 2024/02/26 12:58:55 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 - 2023
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -211,6 +211,9 @@ schedInit(void ** __restrict data, size_t datlen)
 {
 	sched_root_task_t *root = NULL;
 	int (*func)(sched_root_task_t *);
+#if SUP_ENABLE == KQ_SUPPORT
+	sigset_t ss;
+#endif
 #ifdef HAVE_LIBPTHREAD
 	register int i;
 #endif
@@ -269,7 +272,12 @@ schedInit(void ** __restrict data, size_t datlen)
 		for (i = 0; i < taskMAX; i++)
 			pthread_mutex_unlock(&root->root_mtx[i]);
 
+#if SUP_ENABLE == KQ_SUPPORT
+		sigfillset(&ss);
+		pthread_sigmask(SIG_BLOCK, &ss, &root->root_oldset);
+#else
 		pthread_sigmask(SIG_BLOCK, NULL, &root->root_oldset);
+#endif
 #else
 		sigprocmask(SIG_BLOCK, NULL, &root->root_oldset);
 #endif
@@ -1200,7 +1208,8 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 #endif
 
 	if (!on) {
-		pthread_cancel(root->root_sigthr);
+		if (root->root_sigthr)
+			pthread_cancel(root->root_sigthr);
 #ifdef __linux__
 		root->root_sigthr = 0L;
 #else
@@ -1208,6 +1217,10 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 #endif
 		return 0;
 	}
+
+	/* if we have already started signal thread, then skip routine */
+	if (root->root_sigthr)
+		return 0;
 
 	/* if we have not using polling, then we must turn on */
 	if (sched_timespecisinf(&root->root_poll))