--- libaitsched/src/aitsched.c	2023/02/27 01:25:07	1.31.2.1
+++ libaitsched/src/aitsched.c	2023/07/27 20:47:12	1.31.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.31.2.1 2023/02/27 01:25:07 misho Exp $
+* $Id: aitsched.c,v 1.31.2.2 2023/07/27 20:47:12 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -211,6 +211,7 @@ schedInit(void ** __restrict data, size_t datlen)
 {
 	sched_root_task_t *root = NULL;
 	int (*func)(sched_root_task_t *);
+	sigset_t ss;
 #ifdef HAVE_LIBPTHREAD
 	register int i;
 #endif
@@ -268,6 +269,11 @@ schedInit(void ** __restrict data, size_t datlen)
 #ifdef HAVE_LIBPTHREAD
 		for (i = 0; i < taskMAX; i++)
 			pthread_mutex_unlock(&root->root_mtx[i]);
+
+		sigfillset(&ss);
+		pthread_sigmask(SIG_BLOCK, &ss, &root->root_oldset);
+#else
+		sigprocmask(SIG_BLOCK, &ss, &root->root_oldset);
 #endif
 
 		if (data && *data) {
@@ -404,6 +410,8 @@ schedEnd(sched_root_task_t ** __restrict root)
 		pthread_mutex_unlock(&(*root)->root_sigmtx);
 	}
 	pthread_mutex_destroy(&(*root)->root_sigmtx);
+#else
+	sigprocmask(SIG_SETMASK, &(*root)->root_oldset, NULL);
 #endif
 
 	e_free(*root);
@@ -1180,7 +1188,6 @@ _sched_sigDisp(void *arg)
 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");
@@ -1200,9 +1207,6 @@ 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;
 	}
 
@@ -1218,8 +1222,6 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 	pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
 #endif
 
-	sigfillset(&ss);
-	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));
@@ -1228,7 +1230,6 @@ schedSignalDispatch(sched_root_task_t * __restrict roo
 #else
 		root->root_sigthr = NULL;
 #endif
-		pthread_sigmask(SIG_SETMASK, &root->root_oldset, NULL);
 		return -1;
 	}