replace deprecated sys_siglist with strsignal

This commit is contained in:
zhanghua1831 2021-03-27 15:01:50 +08:00
parent 4733c05d44
commit 6692351f89
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,40 @@
From 8b9aa396f1835f57d0c279252361d47be89dbba1 Mon Sep 17 00:00:00 2001
From: zhanghua1831 <zhanghua1831@163.com>
Date: Sat, 27 Mar 2021 14:30:31 +0800
Subject: [PATCH] fix build error, replace deprecated sys_siglist with
strsignal
---
src/mpid/ch3/channels/common/src/util/error_handling.c | 2 +-
src/pm/mpirun/mpispawn.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mpid/ch3/channels/common/src/util/error_handling.c b/src/mpid/ch3/channels/common/src/util/error_handling.c
index eab21a8..2a40dc5 100644
--- a/src/mpid/ch3/channels/common/src/util/error_handling.c
+++ b/src/mpid/ch3/channels/common/src/util/error_handling.c
@@ -69,7 +69,7 @@ int show_backtrace = 0;
// Signal handler for errors
void error_sighandler(int sig, siginfo_t *info, void *secret) {
// Always print error
- PRINT_ERROR( "Caught error: %s (signal %d)\n", sys_siglist[sig], sig );
+ PRINT_ERROR( "Caught error: %s (signal %d)\n", strsignal(sig), sig );
// Show backtrace if required
if (show_backtrace) print_backtrace();
// Raise the signal again with default handler
diff --git a/src/pm/mpirun/mpispawn.c b/src/pm/mpirun/mpispawn.c
index 45e14be..6b38561 100644
--- a/src/pm/mpirun/mpispawn.c
+++ b/src/pm/mpirun/mpispawn.c
@@ -764,7 +764,7 @@ void child_handler(int signal)
gethostname(my_host_name, MAX_HOST_LEN);
rank = mt_id;
- PRINT_DEBUG(DEBUG_Fork_verbose, "mpispawn child_handler: got signal %d: %s\n", signal, sys_siglist[signal]);
+ PRINT_DEBUG(DEBUG_Fork_verbose, "mpispawn child_handler: got signal %d: %s\n", signal, strsignal(signal));
while (1) {
do {
pid = waitpid(-1, &status, WNOHANG);
--
2.23.0

View File

@ -2,7 +2,7 @@
Name: mvapich2
Version: 2.3
Release: 8
Release: 9
Summary: OSU MVAPICH2 MPI package
License: BSD and MIT
URL: http://mvapich.cse.ohio-state.edu
@ -11,6 +11,7 @@ Source1: mvapich2.module.in
Source2: mvapich2.macros.in
Patch0001: 0001-mvapich23-unbundle-contrib-hwloc.patch
Patch0002: 0002-mvapich23-unbundle-osu_benchmarks.patch
Patch0003: 0003-mvapich23-replace-deprecated-sys_siglist-with-strsignal.patch
BuildRequires: gcc-gfortran python3-devel
BuildRequires: bison flex autoconf automake libtool
BuildRequires: perl-Digest-MD5 hwloc-devel rdma-core-devel
@ -253,6 +254,9 @@ cd ..
%changelog
* Sat Mar 27 2021 zhanghua <zhanghua40@huawei.com> - 2.3-9
- fix build error, replace deprecated sys_siglist with strsignal
* Tue Jul 28 2020 lingsheng <lingsheng@huawei.com> - 2.3-8
- Synchronize buildrequire.