--- libaitsched/src/aitsched.c	2023/07/27 20:51:28	1.32
+++ libaitsched/src/aitsched.c	2024/03/20 12:48:45	1.36.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.32 2023/07/27 20:51:28 misho Exp $
+* $Id: aitsched.c,v 1.36.4.1 2024/03/20 12:48:45 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
@@ -54,7 +54,9 @@ char sched_Error[STRSIZ];
 
 #pragma GCC visibility pop
 
+volatile pthread_t sched_sigThr;
 
+
 // sched_GetErrno() Get error code of last operation
 int
 sched_GetErrno()
@@ -211,7 +213,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
@@ -270,11 +274,15 @@ 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
-		sigprocmask(SIG_BLOCK, &ss, &root->root_oldset);
+		pthread_sigmask(SIG_BLOCK, NULL, &root->root_oldset);
 #endif
+#else
+		sigprocmask(SIG_BLOCK, NULL, &root->root_oldset);
+#endif
 
 		if (data && *data) {
 			if (datlen) {
@@ -1068,7 +1076,7 @@ schedPolling(sched_root_task_t * __restrict root, stru
 int
 schedTermCondition(sched_root_task_t * __restrict root, intptr_t * __restrict condValue)
 {
-	if (!root && !condValue)
+	if (!root || !condValue)
 		return -1;
 
 	*root->root_cond = *condValue;
@@ -1183,11 +1191,12 @@ _sched_sigDisp(void *arg)
  *
  * @root = root task
  * @on = Activate or =0 deactivate
- * return: -1 error or 0 ok
+ * return: -1 error, 1 already started, 2 another thread already started or 0 ok
  */
 int
 schedSignalDispatch(sched_root_task_t * __restrict root, int on)
 {
+	sigset_t ss;
 	struct timespec ts = { .tv_sec = 1, .tv_nsec = 0 };
 #ifndef HAVE_LIBPTHREAD
 	sched_SetErr(ENOTSUP, "Library has not support pthreads");
@@ -1201,12 +1210,22 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 #endif
 
 	if (!on) {
-		pthread_cancel(root->root_sigthr);
+		if (root->root_sigthr) {
+			if (root->root_sigthr == sched_sigThr) {
 #ifdef __linux__
-		root->root_sigthr = 0L;
+				sched_sigThr = 0L;
 #else
-		root->root_sigthr = NULL;
+				sched_sigThr = NULL;
 #endif
+			}
+			pthread_cancel(root->root_sigthr);
+#ifdef __linux__
+			root->root_sigthr = 0L;
+#else
+			root->root_sigthr = NULL;
+#endif
+		}
+
 		return 0;
 	}
 
@@ -1222,6 +1241,15 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 	pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
 #endif
 
+	/* if we have already started signal thread, then skip routine */
+	if (root->root_sigthr)
+		return 1;
+	if (sched_sigThr)
+		return 2;
+
+	sigfillset(&ss);
+	pthread_sigmask(SIG_BLOCK, &ss, NULL);
+
 	if (pthread_create(&root->root_sigthr, &attr, _sched_sigDisp, root)) {
 		sched_SetErr(errno, "pthread_create(SignalDispatch) #%d - %s", 
 				errno, strerror(errno));
@@ -1230,8 +1258,10 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 #else
 		root->root_sigthr = NULL;
 #endif
+		pthread_sigmask(SIG_SETMASK, &root->root_oldset, NULL);
 		return -1;
-	}
+	} else
+		sched_sigThr = root->root_sigthr;
 
 	return 0;
 }