sonar is picky, so let's be verbose

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

diff --git a/src/mc/mc_page_snapshot.cpp b/src/mc/mc_page_snapshot.cpp
index 794b4f1..7677ad1 100644 (file)
--- a/src/mc/mc_page_snapshot.cpp
+++ b/src/mc/mc_page_snapshot.cpp
@@ -1,20 +1,21 @@
-/* MC interface: definitions that non-MC modules must see, but not the user */
-
 /* Copyright (c) 2014-2015. 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. */
 
+/* MC interface: definitions that non-MC modules must see, but not the user */
+
+
 #include <unistd.h> // pread, pwrite
 
-#include "PageStore.hpp"
-#include "mc_mmu.h"
-#include "mc_private.h"
-#include "mc_snapshot.h"
+#include "src/mc/PageStore.hpp"
+#include "src/mc/mc_mmu.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_snapshot.h"
 
 #include <xbt/mmalloc.h>
-#include <mc/ChunkedData.hpp>
+#include "src/mc/ChunkedData.hpp"
 
 using simgrid::mc::remote;
 
@@ -34,7 +35,7 @@ void mc_restore_page_snapshot_region(simgrid::mc::Process* process,
 {
   for (size_t i = 0; i != pages_copy.page_count(); ++i) {
     // Otherwise, copy the page:
-    void* target_page = mc_page_from_number(start_addr, i);
+    void* target_page = (void*) simgrid::mc::mmu::join(i, (std::uintptr_t) start_addr);
     const void* source_page = pages_copy.page(i);
     process->write_bytes(source_page, xbt_pagesize, remote(target_page));
   }
@@ -46,7 +47,7 @@ void mc_region_restore_sparse(simgrid::mc::Process* process, mc_mem_region_t reg
 {
   xbt_assert(((reg->permanent_address().address()) & (xbt_pagesize-1)) == 0,
     "Not at the beginning of a page");
-  xbt_assert(mc_page_count(reg->size()) == reg->page_data().page_count());
+  xbt_assert(simgrid::mc::mmu::chunkCount(reg->size()) == reg->page_data().page_count());
   mc_restore_page_snapshot_region(process,
     (void*) reg->permanent_address().address(), reg->page_data());
 }