From f9f0bace7f33ce26311cfa456dd3812d69a5444f Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Thu, 13 Nov 2003 18:04:45 +0000
Subject: [PATCH] o move initialization of signal set into xsignal.c o remove
unneeded #include from interconnect.h
---
src/common/xsignal.c | 1 +
src/slurmd/interconnect.h | 1 -
src/srun/allocate.c | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/common/xsignal.c b/src/common/xsignal.c
index 28d05470d34..8eb09aa21e3 100644
--- a/src/common/xsignal.c
+++ b/src/common/xsignal.c
@@ -91,6 +91,7 @@ xsignal_sigset_create(int sigarray[], sigset_t *setp)
int
xsignal_save_mask(sigset_t *set)
{
+ sigemptyset(set);
return _sigmask(SIG_SETMASK, NULL, set);
}
diff --git a/src/slurmd/interconnect.h b/src/slurmd/interconnect.h
index d700b788347..c5461df7573 100644
--- a/src/slurmd/interconnect.h
+++ b/src/slurmd/interconnect.h
@@ -29,7 +29,6 @@
#ifndef _INTERCONNECT_H_
#define _INTERCONNECT_H_
-#include "src/common/slurm_protocol_api.h"
#include "src/slurmd/job.h"
/*
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index 2bc9b2e5261..2f382fc47b5 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -76,7 +76,6 @@ allocate_nodes(void)
ointf = xsignal(SIGINT, _intr_handler);
otermf = xsignal(SIGTERM, _intr_handler);
- sigemptyset(&oset); /* for clean valgrind */
xsignal_save_mask(&oset);
xsignal_unblock(sigarray);
--
GitLab