From 0f326ba7e6e86aee703aee4b053a1437d5415a5b Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 17 Oct 2017 17:53:27 +0200 Subject: [PATCH] Move macro definitions out of namespace. --- src/mc/mc_checkpoint.cpp | 8 ++++---- src/mc/remote/RemoteClient.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index abd51e2e77..1e24eff865 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -47,6 +47,10 @@ using simgrid::mc::remote; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint"); +#define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC) +#define PROT_RW (PROT_READ | PROT_WRITE) +#define PROT_RX (PROT_READ | PROT_EXEC) + namespace simgrid { namespace mc { @@ -174,10 +178,6 @@ static void get_memory_regions(simgrid::mc::RemoteClient* process, simgrid::mc:: snapshot->privatization_index = simgrid::mc::ProcessIndexMissing; } -#define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC) -#define PROT_RW (PROT_READ | PROT_WRITE) -#define PROT_RX (PROT_READ | PROT_EXEC) - /** \brief Fills the position of the segments (executable, read-only, read/write). * */ // TODO, use the ELF segment information for more robustness diff --git a/src/mc/remote/RemoteClient.cpp b/src/mc/remote/RemoteClient.cpp index 37abc50b98..92a3955abb 100644 --- a/src/mc/remote/RemoteClient.cpp +++ b/src/mc/remote/RemoteClient.cpp @@ -46,12 +46,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc, "MC process information"); // ***** Helper stuff -namespace simgrid { -namespace mc { - #define SO_RE "\\.so[\\.0-9]*$" #define VERSION_RE "-[\\.0-9-]*$" +namespace simgrid { +namespace mc { + // List of library which memory segments are not considered: static const char* const filtered_libraries[] = { #ifdef __linux__ -- 2.20.1