X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd38fea6c9ed9ac4d381cbbfee938776553147fd..646748e03f0997e891f569963d0113e16bb63890:/src/mc/mc_page_snapshot.cpp

diff --git a/src/mc/mc_page_snapshot.cpp b/src/mc/mc_page_snapshot.cpp
index b180c4021c..794b4f129c 100644
--- a/src/mc/mc_page_snapshot.cpp
+++ b/src/mc/mc_page_snapshot.cpp
@@ -14,62 +14,10 @@
 #include "mc_snapshot.h"
 
 #include <xbt/mmalloc.h>
-
-#define SOFT_DIRTY_BIT_NUMBER 55
-#define SOFT_DIRTY (((uint64_t)1) << SOFT_DIRTY_BIT_NUMBER)
+#include <mc/ChunkedData.hpp>
 
 using simgrid::mc::remote;
 
-namespace simgrid {
-namespace mc {
-
-/** @brief Take a per-page snapshot of a region
- *
- *  @param data            The start of the region (must be at the beginning of a page)
- *  @param pag_count       Number of pages of the region
- *  @return                Snapshot page numbers of this new snapshot
- */
-PerPageCopy::PerPageCopy(PageStore& store, AddressSpace& as,
-    remote_ptr<void> addr, std::size_t page_count,
-    const size_t* ref_page_numbers, const std::uint64_t* pagemap)
-{
-  store_ = &store;
-  this->pagenos_.resize(page_count);
-  std::vector<char> buffer(xbt_pagesize);
-
-  for (size_t i = 0; i != page_count; ++i) {
-
-    // We don't have to compare soft-clean pages:
-    if (ref_page_numbers && pagemap && !(pagemap[i] & SOFT_DIRTY)) {
-      pagenos_[i] = ref_page_numbers[i];
-      store_->ref_page(ref_page_numbers[i]);
-      continue;
-    }
-
-      remote_ptr<void> page = remote(addr.address() + (i << xbt_pagebits));
-      xbt_assert(mc_page_offset((void*)page.address())==0,
-        "Not at the beginning of a page");
-
-        /* Adding another copy (and a syscall) will probably slow things a lot.
-           TODO, optimize this somehow (at least by grouping the syscalls)
-           if needed. Either:
-            - reduce the number of syscalls;
-            - let the application snapshot itself;
-            - move the segments in shared memory (this will break `fork` however).
-        */
-
-        as.read_bytes(
-          buffer.data(), xbt_pagesize, page,
-          simgrid::mc::ProcessIndexDisabled);
-
-      pagenos_[i] = store_->store_page(buffer.data());
-
-  }
-}
-
-}
-}
-
 extern "C" {
 
 /** @brief Restore a snapshot of a region
@@ -82,7 +30,7 @@ extern "C" {
  *  @param pagenos
  */
 void mc_restore_page_snapshot_region(simgrid::mc::Process* process,
-  void* start_addr, simgrid::mc::PerPageCopy const& pages_copy)
+  void* start_addr, simgrid::mc::ChunkedData const& pages_copy)
 {
   for (size_t i = 0; i != pages_copy.page_count(); ++i) {
     // Otherwise, copy the page: