From b89b862c7f3387c6db514a2fe83da18b02108f28 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 4 Aug 2020 12:27:57 +0300 Subject: [PATCH] Small refactoring. --- src/ParaMEDMEMTest/MPI2Connector.cxx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/ParaMEDMEMTest/MPI2Connector.cxx b/src/ParaMEDMEMTest/MPI2Connector.cxx index ef55de0f8..87b16bfb2 100644 --- a/src/ParaMEDMEMTest/MPI2Connector.cxx +++ b/src/ParaMEDMEMTest/MPI2Connector.cxx @@ -26,6 +26,12 @@ #include #endif +#if OMPI_MAJOR_VERSION >= 4 +#define MPI_ERROR_HANDLER(var) MPI_Comm_set_errhandler(MPI_COMM_WORLD, var); +#else +#define MPI_ERROR_HANDLER(var) MPI_Errhandler_set(MPI_COMM_WORLD, var); +#endif + MPI2Connector::MPI2Connector() { MPI_Comm_size( MPI_COMM_WORLD, &_nb_proc ); @@ -54,11 +60,7 @@ MPI_Comm MPI2Connector::remoteMPI2Connect(const std::string& service) _srv = false; MPI_Barrier(MPI_COMM_WORLD); -#if OMPI_MAJOR_VERSION >= 4 - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN); -#else - MPI_Errhandler_set(MPI_COMM_WORLD, MPI_ERRORS_RETURN); -#endif + MPI_ERROR_HANDLER(MPI_ERRORS_RETURN); if( _num_proc == 0 ) { /* rank 0 try to be a server. If service is already published, try to be a cient */ @@ -107,11 +109,7 @@ MPI_Comm MPI2Connector::remoteMPI2Connect(const std::string& service) throw std::exception(); } } -#if OMPI_MAJOR_VERSION >= 4 - MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_ARE_FATAL); -#else - MPI_Errhandler_set(MPI_COMM_WORLD, MPI_ERRORS_ARE_FATAL); -#endif + MPI_ERROR_HANDLER(MPI_ERRORS_ARE_FATAL); /* If rank 0 is server, all processes call MPI_Comm_accept */ /* If rank 0 is not server, all processes call MPI_Comm_connect */ -- 2.39.2