Revert "Remove XBT_INFO call"

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

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index c91d27c..fe8f3b4 100644 (file)
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -4,6 +4,7 @@
 /* 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 "internal_config.h"
 #include "private.h"
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
@@ -589,11 +590,18 @@ void switch_data_segment(int dest){
 
   if (loaded_page==dest)//no need to switch either
     return;
+
+
 #ifdef HAVE_MMAP
+  int i;
+  if(loaded_page==-1){//initial switch, do the copy from the real page here
+    for (i=0; i< SIMIX_process_count(); i++){
+      memcpy(mappings[i],TOPAGE(start_data_exe),size_data_exe);
+    }
+  }
   int current= fds[dest];
   XBT_VERB("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);
-  msync(TOPAGE(start_data_exe), size_data_exe, MS_SYNC | MS_INVALIDATE );
   if (tmp != TOPAGE(start_data_exe))
     xbt_die("Couldn't map the new region");
   loaded_page=dest;
@@ -734,10 +742,10 @@ void smpi_initialize_global_memory_segments(){
 }
 
 void smpi_destroy_global_memory_segments(){
-  int i;
   if(size_data_exe == 0)//no need to switch
     return;
 #ifdef HAVE_MMAP
+  int i;
   for (i=0; i< smpi_process_count(); i++){
     if(munmap(mappings[i],size_data_exe) < 0) {
       XBT_WARN("Unmapping of fd %d failed: %s", fds[i], strerror(errno));