From a1f3f97e7971074fb6bc141afa7f4d085e8d16ac Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Thu, 6 Jul 2017 19:08:02 +0200 Subject: [PATCH] [SMPI] Move SMPI_PRIVATIZATION_* macros to enums I didn't see any reason this should be a macro. The naming is still the same and certainly ugly, but this should be better for the moment. --- src/simix/ActorImpl.cpp | 2 +- src/simix/smx_global.cpp | 1 + src/smpi/private.h | 7 ------- src/smpi/private.hpp | 10 ++++++++++ src/smpi/smpi_comm.cpp | 1 + src/smpi/smpi_datatype.cpp | 1 + src/smpi/smpi_global.cpp | 1 + src/smpi/smpi_op.cpp | 1 + src/smpi/smpi_process.cpp | 1 + src/smpi/smpi_request.cpp | 1 + 10 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 9cc63bbe7c..4d2b7ba979 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -31,7 +31,7 @@ #include "src/surf/surf_interface.hpp" #ifdef HAVE_SMPI -#include "src/smpi/private.h" +#include "src/smpi/private.hpp" #endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 376c1b9177..ab65eeb66c 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -44,6 +44,7 @@ #if HAVE_SMPI #include "src/smpi/private.h" +#include "src/smpi/private.hpp" #endif XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); diff --git a/src/smpi/private.h b/src/smpi/private.h index 13eb9f9c3e..d307b72664 100644 --- a/src/smpi/private.h +++ b/src/smpi/private.h @@ -75,13 +75,6 @@ XBT_PRIVATE void smpi_mpi_init(); // utilities extern XBT_PRIVATE double smpi_cpu_threshold; extern XBT_PRIVATE double smpi_host_speed; - -#define SMPI_PRIVATIZE_NONE 0 -#define SMPI_PRIVATIZE_MMAP 1 -#define SMPI_PRIVATIZE_DLOPEN 2 -#define SMPI_PRIVATIZE_DEFAULT SMPI_PRIVATIZE_MMAP -extern XBT_PRIVATE int smpi_privatize_global_variables; - extern XBT_PRIVATE char* smpi_start_data_exe; //start of the data+bss segment of the executable extern XBT_PRIVATE int smpi_size_data_exe; //size of the data+bss segment of the executable diff --git a/src/smpi/private.hpp b/src/smpi/private.hpp index 87d51f8ec6..46825403f9 100644 --- a/src/smpi/private.hpp +++ b/src/smpi/private.hpp @@ -33,5 +33,15 @@ extern "C" { XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location(); XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location(); } + +typedef enum { + SMPI_PRIVATIZE_NONE = 0, + SMPI_PRIVATIZE_MMAP = 1, + SMPI_PRIVATIZE_DLOPEN = 2, + SMPI_PRIVATIZE_DEFAULT = SMPI_PRIVATIZE_MMAP +} smpi_priv_strategies; + +extern XBT_PRIVATE int smpi_privatize_global_variables; + #endif diff --git a/src/smpi/smpi_comm.cpp b/src/smpi/smpi_comm.cpp index d5ac71c5fa..316880dd65 100644 --- a/src/smpi/smpi_comm.cpp +++ b/src/smpi/smpi_comm.cpp @@ -8,6 +8,7 @@ #include "src/simix/smx_private.h" #include "src/smpi/private.h" +#include "src/smpi/private.hpp" #include "src/smpi/smpi_comm.hpp" #include "src/smpi/smpi_coll.hpp" #include "src/smpi/smpi_datatype.hpp" diff --git a/src/smpi/smpi_datatype.cpp b/src/smpi/smpi_datatype.cpp index d93fc2da8b..de74190462 100644 --- a/src/smpi/smpi_datatype.cpp +++ b/src/smpi/smpi_datatype.cpp @@ -6,6 +6,7 @@ #include "simgrid/modelchecker.h" #include "src/smpi/private.h" +#include "src/smpi/private.hpp" #include "src/smpi/smpi_datatype_derived.hpp" #include "src/smpi/smpi_op.hpp" #include "src/smpi/smpi_process.hpp" diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp index 4a0758da72..afa8e584d0 100644 --- a/src/smpi/smpi_global.cpp +++ b/src/smpi/smpi_global.cpp @@ -12,6 +12,7 @@ #include "src/smpi/SmpiHost.hpp" #include "xbt/config.hpp" #include "src/smpi/private.h" +#include "src/smpi/private.hpp" #include "src/smpi/smpi_coll.hpp" #include "src/smpi/smpi_comm.hpp" #include "src/smpi/smpi_group.hpp" diff --git a/src/smpi/smpi_op.cpp b/src/smpi/smpi_op.cpp index 9cd6612b1c..4f52efedcd 100644 --- a/src/smpi/smpi_op.cpp +++ b/src/smpi/smpi_op.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/smpi/private.h" +#include "src/smpi/private.hpp" #include "src/smpi/smpi_datatype.hpp" #include "src/smpi/smpi_op.hpp" #include "src/smpi/smpi_process.hpp" diff --git a/src/smpi/smpi_process.cpp b/src/smpi/smpi_process.cpp index 60f576028e..a7da2c8d9d 100644 --- a/src/smpi/smpi_process.cpp +++ b/src/smpi/smpi_process.cpp @@ -8,6 +8,7 @@ #include "src/msg/msg_private.h" #include "src/simix/smx_private.h" #include "src/smpi/private.h" +#include "src/smpi/private.hpp" #include "src/smpi/smpi_process.hpp" #include "src/smpi/smpi_group.hpp" #include "src/smpi/smpi_comm.hpp" diff --git a/src/smpi/smpi_request.cpp b/src/smpi/smpi_request.cpp index e3d477bee1..19c5497096 100644 --- a/src/smpi/smpi_request.cpp +++ b/src/smpi/smpi_request.cpp @@ -10,6 +10,7 @@ #include "src/mc/mc_replay.h" #include "src/smpi/SmpiHost.hpp" #include "src/smpi/private.h" +#include "src/smpi/private.hpp" #include "src/smpi/smpi_comm.hpp" #include "src/smpi/smpi_datatype.hpp" #include "src/smpi/smpi_op.hpp" -- 2.20.1