Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / smpi_memory.cpp

diff --git a/src/smpi/smpi_memory.cpp b/src/smpi/smpi_memory.cpp
index 6893833..934885a 100644 (file)
--- a/src/smpi/smpi_memory.cpp
+++ b/src/smpi/smpi_memory.cpp
@@ -4,11 +4,14 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <iostream>
+#include <cstdint>
+#include <climits>
+
+#include <vector>
 
-#include <limits.h>
 #include <stdlib.h>
 #include <sys/types.h>
+
 #ifndef WIN32
 #include <sys/mman.h>
 #include <unistd.h>
@@ -22,8 +25,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_memory, smpi, "Memory layout support for SM
 
 static const int PROT_RWX = (PROT_READ | PROT_WRITE | PROT_EXEC);
 static const int PROT_RW  = (PROT_READ | PROT_WRITE );
+XBT_ATTRIB_UNUSED static const int PROT_RX  = (PROT_READ | PROT_EXEC );
 
-void smpi_get_executable_global_size(void)
+void smpi_get_executable_global_size()
 {
   char buffer[PATH_MAX];
   char* full_name = realpath(xbt_binary_name, buffer);
@@ -44,8 +48,8 @@ void smpi_get_executable_global_size(void)
          following the rw- area is the end of the data segment. It would
          be better to check with the size of the data segment. */
       if (i != map.end() && i->pathname.empty() && (i->prot & PROT_RWX) == PROT_RW
-          && i->start_addr == (std::uint64_t) smpi_start_data_exe + smpi_size_data_exe) {
-        smpi_size_data_exe = i->end_addr - (std::uint64_t) smpi_start_data_exe;
+          && (char*)i->start_addr ==  smpi_start_data_exe + smpi_size_data_exe) {
+        smpi_size_data_exe = (char*)i->end_addr - smpi_start_data_exe;
       }
       return;
     }