Merge branch 'master' of github.com:mquinson/simgrid

diff --git a/appveyor.yml b/appveyor.yml
index c4dbb6d..03778dc 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,10 +12,6 @@ init:
 - git config --global core.longpaths true
 - git config --global core.autocrlf input
 
-#platform: 
-#  - Win32 # This is Windows 32bits
-#  - x64   # This is Windows 64bits
-
 environment:
   global:
     BOOST_ROOT: c:\Libraries\boost_1_59_0
@@ -26,15 +22,16 @@ environment:
   matrix:
     - COMPILER: MSVC15
       PLATFORM: Win32
-    - COMPILER: MSVC15
-      PLATFORM: x64
     - COMPILER: MinGW-w64
+
+#    - COMPILER: MSVC15
+#      PLATFORM: x64
       
 install:
 - if [%COMPILER%]==[MinGW]     set PATH=C:\MinGW\bin;%PATH%
 - if [%COMPILER%]==[MinGW-w64] set PATH=C:\mingw64\bin;%PATH%
-- if [%COMPILER%]==[MSYS2]     set PATH=C:\msys64\bin,%PATH%
 - if [%COMPILER%]==[MinGW-w64] rename "C:\Program Files (x86)\Git\bin\sh.exe" "sh2.exe"
+- if [%COMPILER%]==[MSYS2]     set PATH=C:\msys64\bin,%PATH%
 
 build_script:
 - if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015"       -Denable_smpi=OFF -Denable_mallocators=OFF .

diff --git a/doc/doxygen/deployment.doc b/doc/doxygen/deployment.doc
index 06602e3..1439a60 100644 (file)
--- a/doc/doxygen/deployment.doc
+++ b/doc/doxygen/deployment.doc
@@ -22,7 +22,7 @@ order in which the \c argument tags are given is important and depends on the ap
 
 #### Attribute list ####
 
-As already written above, the \c process tag is the tag that defines which host
+%As already written above, the \c process tag is the tag that defines which host
 executes which function (from your application). Hence, the \c host and \c function
 attributes are mandatory; however, there are some optional attributes to the process tag. Here is a list of all attributes of this tag:
 

diff --git a/src/mc/ObjectInformation.hpp b/src/mc/ObjectInformation.hpp
index 8ada283..21c3a04 100644 (file)
--- a/src/mc/ObjectInformation.hpp
+++ b/src/mc/ObjectInformation.hpp
@@ -88,7 +88,11 @@ public:
 
   bool privatized() const
   {
+#ifdef HAVE_SMPI
     return this->executable() && smpi_privatize_global_variables;
+#else
+    return false;
+#endif
   }
 
   void* base_address() const;

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 7f4a821..8821fbb 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -83,6 +83,7 @@ static void MC_region_restore(mc_mem_region_t region)
 namespace simgrid {
 namespace mc {
 
+#ifdef HAVE_SMPI
 simgrid::mc::RegionSnapshot privatized_region(
     RegionType region_type, void *start_addr, void* permanent_addr, size_t size
     )
@@ -112,6 +113,7 @@ simgrid::mc::RegionSnapshot privatized_region(
   region.privatized_data(std::move(data));
   return std::move(region);
 }
+#endif
 
 }
 }
@@ -128,12 +130,14 @@ static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
   else if (type == simgrid::mc::RegionType::Heap)
     xbt_assert(!object_info, "Unexpected object info for heap region.");
 
-  const bool privatization_aware = object_info && object_info->privatized();
-
   simgrid::mc::RegionSnapshot region;
+
+#ifdef HAVE_SMPI
+  const bool privatization_aware = object_info && object_info->privatized();
   if (privatization_aware && MC_smpi_process_count())
     region = simgrid::mc::privatized_region(type, start_addr, permanent_addr, size);
   else
+#endif
     region = simgrid::mc::region(type, start_addr, permanent_addr, size);
 
   region.object_info(object_info);
@@ -535,8 +539,10 @@ static std::vector<s_fd_infos_t> MC_get_current_fds(pid_t pid)
     }
     link[res] = '\0';
 
+#ifdef HAVE_SMPI
     if(smpi_is_privatisation_file(link))
       continue;
+#endif
 
     // This is (probably) the DIR* we are reading:
     // TODO, read all the file entries at once and close the DIR.*

diff --git a/src/mc/mc_process.cpp b/src/mc/mc_process.cpp
index f66e9d1..a39caa5 100644 (file)
--- a/src/mc/mc_process.cpp
+++ b/src/mc/mc_process.cpp
@@ -525,6 +525,7 @@ const void *Process::read_bytes(void* buffer, std::size_t size,
     std::shared_ptr<simgrid::mc::ObjectInformation> const& info =
       this->find_object_info_rw((void*)address.address());
     // Segment overlap is not handled.
+#ifdef HAVE_SMPI
     if (info.get() && info.get()->privatized()) {
       if (process_index < 0)
         xbt_die("Missing process index");
@@ -544,6 +545,7 @@ const void *Process::read_bytes(void* buffer, std::size_t size,
       size_t offset = address.address() - (std::uint64_t)info->start_rw;
       address = remote((char*)privatisation_region.address + offset);
     }
+#endif
   }
 
   if (this->is_self()) {

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 643726e..7b76077 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -212,6 +212,7 @@ const char* MC_smx_process_get_name(smx_process_t p)
   return info->name;
 }
 
+#ifdef HAVE_SMPI
 int MC_smpi_process_count(void)
 {
   if (mc_mode == MC_MODE_CLIENT)
@@ -223,6 +224,7 @@ int MC_smpi_process_count(void)
     return res;
   }
 }
+#endif
 
 unsigned long MC_smx_get_maxpid(void)
 {