Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 9aa90a6..ef98cce 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -35,6 +35,7 @@
 #include "src/mc/mc_smx.h"
 #include "mc_hash.hpp"
 
+#include "src/mc/RegionSnapshot.hpp"
 #include "src/mc/ObjectInformation.hpp"
 #include "src/mc/Frame.hpp"
 #include "src/mc/Variable.hpp"
@@ -83,9 +84,9 @@ namespace simgrid {
 namespace mc {
 
 #ifdef HAVE_SMPI
-simgrid::mc::RegionSnapshot privatized_region(
+RegionSnapshot privatized_region(
     RegionType region_type, void *start_addr, void* permanent_addr,
-    std::size_t size, const simgrid::mc::RegionSnapshot* ref_region
+    std::size_t size, const RegionSnapshot* ref_region
     )
 {
   size_t process_count = MC_smpi_process_count();
@@ -496,7 +497,7 @@ static std::vector<s_fd_infos_t> MC_get_current_fds(pid_t pid)
   struct dirent* fd_number;
   while ((fd_number = readdir(fd_dir))) {
 
-    int fd_value = atoi(fd_number->d_name);
+    int fd_value = xbt_str_parse_int(fd_number->d_name, "Found a non-numerical FD: %s. Freaking out!");
 
     if(fd_value < 3)
       continue;