fix compil of smpi_bench.c on win32

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

diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index b626665..f7464db 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"
@@ -24,6 +25,10 @@
 #include <string.h>
 #include <stdio.h>
 
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi,
                                 "Logging specific to SMPI (benchmarking)");
 
@@ -239,11 +244,11 @@ int smpi_gettimeofday(struct timeval *tv)
   return 0;
 }
 
-extern double sg_maxmin_precision;
+extern double sg_surf_precision;
 unsigned long long smpi_rastro_resolution (void)
 {
   smpi_bench_end();
-  double resolution = (1/sg_maxmin_precision);
+  double resolution = (1/sg_surf_precision);
   smpi_bench_begin();
   return (unsigned long long)resolution;
 }
@@ -569,7 +574,6 @@ void* smpi_shared_set_call(const char* func, const char* input, void* data) {
 
 
 
-#ifndef WIN32
 #define TOPAGE(addr) (void *)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize)
 
 
@@ -590,13 +594,21 @@ 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;
+#endif
 }
 
 void smpi_get_executable_global_size(){
@@ -675,14 +687,20 @@ void smpi_get_executable_global_size(){
 
 void smpi_initialize_global_memory_segments(){
 
+#ifndef HAVE_MMAP
+  smpi_privatize_global_variables=0;
+  return;
+#else
+
   unsigned int i = 0;
   smpi_get_executable_global_size();
 
-  XBT_VERB ("We have a size of bss+data of %d starting at %p",size_data_exe, start_data_exe );
-
+  XBT_DEBUG ("bss+data segment found : size %d starting at %p",size_data_exe, start_data_exe );
 
-  if(size_data_exe == 0)//no need to switch
+  if(size_data_exe == 0){//no need to switch
+    smpi_privatize_global_variables=0;
     return;
+  }
 
   fds= (int*)xbt_malloc((smpi_process_count())*sizeof(int));
   mappings= (void**)xbt_malloc((smpi_process_count())*sizeof(void*));
@@ -722,13 +740,15 @@ void smpi_initialize_global_memory_segments(){
       mappings[i]= address;
   }
 
+#endif
+
 }
 
 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));
@@ -738,7 +758,7 @@ void smpi_destroy_global_memory_segments(){
   xbt_free(mappings);
   xbt_free(fds);
 
-}
+#endif
 
+}
 
-#endif