X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6c92774f687cc85981102bee0ffe4c71dabaf51..50683b2a05805cc9f74a47907405da062ce4feef:/src/xbt/memory_map.cpp

diff --git a/src/xbt/memory_map.cpp b/src/xbt/memory_map.cpp
index 418e93b8af..567611b81b 100644
--- a/src/xbt/memory_map.cpp
+++ b/src/xbt/memory_map.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -46,16 +46,14 @@
 # include <libprocstat.h>
 #endif
 
-#include <xbt/sysdep.h>
+#include <cinttypes>
 #include <xbt/base.h>
-#include <xbt/file.h>
 #include <xbt/log.h>
+#include <xbt/sysdep.h>
 
 #include "memory_map.hpp"
 
-extern "C" {
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_memory_map, xbt, "Logging specific to algorithms for memory_map");
-}
 
 namespace simgrid {
 namespace xbt {
@@ -153,15 +151,9 @@ XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
     path[pathlen]   = '\0';
     memreg.pathname = path;
 
-#if 0 /* Display mappings for debug */
-    fprintf(stderr,
-        "%#014llx - %#014llx | %c%c%c | %s\n",
-        memreg.start_addr, memreg.end_addr,
-        (memreg.prot & PROT_READ) ? 'r' : '-',
-        (memreg.prot & PROT_WRITE) ? 'w' : '-',
-        (memreg.prot & PROT_EXEC) ? 'x' : '-',
-        memreg.pathname.c_str());
-#endif
+    XBT_DEBUG("Region: %016" PRIx64 "-%016" PRIx64 " | %c%c%c | %s", memreg.start_addr, memreg.end_addr,
+              (memreg.prot & PROT_READ) ? 'r' : '-', (memreg.prot & PROT_WRITE) ? 'w' : '-',
+              (memreg.prot & PROT_EXEC) ? 'x' : '-', memreg.pathname.c_str());
 
     ret.push_back(std::move(memreg));
     address += size;