[SMPI] Fixed portability issues with shm_open.

[simgrid.git] / src / smpi / smpi_bench.c

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index 79179a7..d863016 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -13,6 +13,7 @@
 #include "surf/surf.h"
 #include "simgrid/sg_config.h"
 #include "simgrid/modelchecker.h"
+#include "mc/mc_replay.h"
 
 #ifndef WIN32
 #include <sys/mman.h>
@@ -75,12 +76,10 @@ double smpi_cpu_threshold;
 double smpi_running_power;
 
 int smpi_loaded_page = -1;
-char* start_data_exe = NULL;
-int size_data_exe = 0;
+char* smpi_start_data_exe = NULL;
+int smpi_size_data_exe = 0;
 int smpi_privatize_global_variables;
 double smpi_total_benched_time = 0;
-
-
 smpi_privatisation_region_t smpi_privatisation_regions;
 
 typedef struct {
@@ -461,7 +460,7 @@ void *smpi_shared_malloc(size_t size, const char *file, int line)
 {
   void* mem;
   if (sg_cfg_get_boolean("smpi/use_shared_malloc")){
-    char *loc = bprintf("%zu_%s_%d", (size_t)getpid(), file, line);
+    char *loc = bprintf("/%zu_%s_%d", (size_t)getpid(), file, line);
     int fd;
     shared_data_t *data;
     loc = smpi_shared_alloc_hash(loc); /* hash loc, in order to have something
@@ -619,23 +618,26 @@ void smpi_switch_data_segment(int dest){
  */
 void smpi_really_switch_data_segment(int dest) {
 
-  if(size_data_exe == 0)//no need to switch
+  if(smpi_size_data_exe == 0)//no need to switch
     return;
 
 #ifdef HAVE_MMAP
   int i;
   if(smpi_loaded_page==-1){//initial switch, do the copy from the real page here
     for (i=0; i< SIMIX_process_count(); i++){
-      memcpy(smpi_privatisation_regions[i].address,TOPAGE(start_data_exe),size_data_exe);
+      memcpy(smpi_privatisation_regions[i].address,
+        TOPAGE(smpi_start_data_exe), smpi_size_data_exe);
     }
   }
 
+  // FIXME, cross-process support (mmap across process when necessary)
   int current = smpi_privatisation_regions[dest].file_descriptor;
   XBT_DEBUG("Switching data frame to the one of process %d", dest);
-  void* tmp = mmap (TOPAGE(start_data_exe), size_data_exe, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, current, 0);
-  if (tmp != TOPAGE(start_data_exe))
+  void* tmp = mmap (TOPAGE(smpi_start_data_exe), smpi_size_data_exe,
+    PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, current, 0);
+  if (tmp != TOPAGE(smpi_start_data_exe))
     xbt_die("Couldn't map the new region");
-  smpi_loaded_page=dest;
+  smpi_loaded_page = dest;
 #endif
 }
 
@@ -697,12 +699,12 @@ void smpi_get_executable_global_size(){
     if(i>=6){
       if(strcmp(lfields[1], ".data") == 0){
         size_data_binary = strtoul(lfields[2], NULL, 16);
-        start_data_exe = (char*) strtoul(lfields[4], NULL, 16);
+        smpi_start_data_exe = (char*) strtoul(lfields[4], NULL, 16);
         found++;
       }else if(strcmp(lfields[1], ".bss") == 0){
         //the beginning of bss is not exactly the end of data if not aligned, grow bss reported size accordingly
         //TODO : check if this is OK, as some segments may be inserted between them..
-        size_bss_binary = ((char*) strtoul(lfields[4], NULL, 16) - (start_data_exe + size_data_binary))
+        size_bss_binary = ((char*) strtoul(lfields[4], NULL, 16) - (smpi_start_data_exe + size_data_binary))
                           + strtoul(lfields[2], NULL, 16);
         found++;
        }
@@ -711,7 +713,9 @@ void smpi_get_executable_global_size(){
 
   }
 
-  size_data_exe =(unsigned long)start_data_exe - (unsigned long)TOPAGE(start_data_exe)+ size_data_binary+size_bss_binary;
+  smpi_size_data_exe = (unsigned long) smpi_start_data_exe
+    - (unsigned long) TOPAGE(smpi_start_data_exe)
+    + size_data_binary+size_bss_binary;
   xbt_free(command);
   xbt_free(line);
   pclose(fp);
@@ -728,9 +732,10 @@ void smpi_initialize_global_memory_segments(){
   unsigned int i = 0;
   smpi_get_executable_global_size();
 
-  XBT_DEBUG ("bss+data segment found : size %d starting at %p",size_data_exe, start_data_exe );
+  XBT_DEBUG ("bss+data segment found : size %d starting at %p",
+    smpi_size_data_exe, smpi_start_data_exe );
 
-  if(size_data_exe == 0){//no need to switch
+  if (smpi_size_data_exe == 0){//no need to switch
     smpi_privatize_global_variables=0;
     return;
   }
@@ -769,17 +774,17 @@ Ask the Internet about tutorials on how to increase the files limit such as: htt
       if (status)
         xbt_die("Impossible to unlink temporary file for memory mapping");
 
-      status = ftruncate(file_descriptor, size_data_exe);
+      status = ftruncate(file_descriptor, smpi_size_data_exe);
       if(status)
         xbt_die("Impossible to set the size of the temporary file for memory mapping");
 
       /* Ask for a free region */
-      address = mmap (NULL, size_data_exe, PROT_READ | PROT_WRITE, MAP_SHARED, file_descriptor, 0);
+      address = mmap (NULL, smpi_size_data_exe, PROT_READ | PROT_WRITE, MAP_SHARED, file_descriptor, 0);
       if (address == MAP_FAILED)
         xbt_die("Couldn't find a free region for memory mapping");
 
       //initialize the values
-      memcpy(address,TOPAGE(start_data_exe),size_data_exe);
+      memcpy(address, TOPAGE(smpi_start_data_exe), smpi_size_data_exe);
 
       //store the address of the mapping for further switches
       smpi_privatisation_regions[i].file_descriptor = file_descriptor;
@@ -791,12 +796,12 @@ Ask the Internet about tutorials on how to increase the files limit such as: htt
 }
 
 void smpi_destroy_global_memory_segments(){
-  if(size_data_exe == 0)//no need to switch
+  if (smpi_size_data_exe == 0)//no need to switch
     return;
 #ifdef HAVE_MMAP
   int i;
   for (i=0; i< smpi_process_count(); i++){
-    if(munmap(smpi_privatisation_regions[i].address,size_data_exe) < 0) {
+    if(munmap(smpi_privatisation_regions[i].address, smpi_size_data_exe) < 0) {
       XBT_WARN("Unmapping of fd %d failed: %s",
         smpi_privatisation_regions[i].file_descriptor, strerror(errno));
     }