[mc] Use string::compare instead of strcmp

[simgrid.git] / src / mc / mc_checkpoint.cpp

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 54f04df..b5aba8c 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -29,13 +29,17 @@
 #include <mc/mc.h>
 
 #include "mc_snapshot.h"
-#include "mc_object_info.h"
+#include "mc_dwarf.hpp"
 #include "mc_mmu.h"
 #include "mc_unw.h"
 #include "mc_protocol.h"
 #include "mc_smx.h"
 #include "mc_hash.hpp"
 
+#include "mc/ObjectInformation.hpp"
+#include "mc/Frame.hpp"
+#include "mc/Variable.hpp"
+
 using simgrid::mc::remote;
 
 extern "C" {
@@ -79,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
     )
@@ -108,6 +113,7 @@ simgrid::mc::RegionSnapshot privatized_region(
   region.privatized_data(std::move(data));
   return std::move(region);
 }
+#endif
 
 }
 }
@@ -124,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);
@@ -531,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.*