--- libaitsched/src/aitsched.c	2023/02/24 15:49:01	1.30.2.5
+++ libaitsched/src/aitsched.c	2023/02/25 15:46:15	1.30.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.30.2.5 2023/02/24 15:49:01 misho Exp $
+* $Id: aitsched.c,v 1.30.2.6 2023/02/25 15:46:15 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -181,7 +181,6 @@ schedRegisterHooks(sched_root_task_t * __restrict root
 	root->root_hooks.hook_add.alarm = sched_hook_alarm;
 	root->root_hooks.hook_add.node = sched_hook_node;
 	root->root_hooks.hook_add.proc = sched_hook_proc;
-	root->root_hooks.hook_add.signal = sched_hook_signal;
 #ifdef EVFILT_USER
 	root->root_hooks.hook_add.user = sched_hook_user;
 #endif
@@ -189,6 +188,7 @@ schedRegisterHooks(sched_root_task_t * __restrict root
 #ifdef HAVE_LIBPTHREAD
 	root->root_hooks.hook_add.thread = sched_hook_thread;
 #endif
+	root->root_hooks.hook_add.signal = sched_hook_signal;
 
 	root->root_hooks.hook_exec.cancel = sched_hook_cancel;
 	root->root_hooks.hook_exec.fetch = sched_hook_fetch;
@@ -228,6 +228,12 @@ schedInit(void ** __restrict data, size_t datlen)
 		sched_timespecinf(&root->root_poll);
 
 #ifdef HAVE_LIBPTHREAD
+		if (pthread_mutex_init(&root->root_sigmtx, NULL)) {
+			LOGERR;
+			e_free(root);
+			return NULL;
+		}
+
 		for (i = 0; i < taskMAX; i++)
 			if ((errno = pthread_mutex_init(&root->root_mtx[i], NULL))) {
 				LOGERR;
@@ -394,7 +400,10 @@ schedEnd(sched_root_task_t ** __restrict root)
 #else
 		(*root)->root_sigthr = NULL;
 #endif
+		pthread_sigmask(SIG_SETMASK, &(*root)->root_oldset, NULL);
+		pthread_mutex_unlock(&(*root)->root_sigmtx);
 	}
+	pthread_mutex_destroy(&(*root)->root_sigmtx);
 #endif
 
 	e_free(*root);
@@ -1126,11 +1135,19 @@ _sched_sigDisp(void *arg)
 	sched_root_task_t *root = arg;
 	sched_task_t *task, *tmp;
 	int sig, flg;
+	sigset_t ss;
 
+	sigfillset(&ss);
 	while (root->root_sigthr) {
-		if (sigwait(&root->root_sigset, &sig))
+		if (sigwait(&ss, &sig))
 			continue;
 
+		pthread_mutex_lock(&root->root_sigmtx);
+		if (!sigismember(&root->root_sigset, sig)) {
+			pthread_mutex_unlock(&root->root_sigmtx);
+			continue;
+		}
+
 		flg = 0;
 		TAILQ_FOREACH_SAFE(task, &root->root_signal, task_node, tmp) {
 			if (TASK_VAL(task) == (uintptr_t) sig) {
@@ -1146,6 +1163,8 @@ _sched_sigDisp(void *arg)
 		}
 		if (flg < 2)
 			sigdelset(&root->root_sigset, sig);
+
+		pthread_mutex_unlock(&root->root_sigmtx);
 	}
 
 	return NULL;
@@ -1180,6 +1199,9 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 #else
 		root->root_sigthr = NULL;
 #endif
+		pthread_sigmask(SIG_SETMASK, &root->root_oldset, NULL);
+
+		pthread_mutex_unlock(&root->root_sigmtx);
 		return 0;
 	}
 
@@ -1192,10 +1214,16 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 #endif
 
 	sigfillset(&ss);
-	pthread_sigmask(SIG_BLOCK, &ss, NULL);
+	pthread_sigmask(SIG_BLOCK, &ss, &root->root_oldset);
 	if (pthread_create(&root->root_sigthr, &attr, _sched_sigDisp, root)) {
 		sched_SetErr(errno, "pthread_create(SignalDispatch) #%d - %s", 
 				errno, strerror(errno));
+#ifdef __linux__
+		root->root_sigthr = 0L;
+#else
+		root->root_sigthr = NULL;
+#endif
+		pthread_sigmask(SIG_SETMASK, &root->root_oldset, NULL);
 		return -1;
 	}