X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea9cce21b6d3f37823143217f1ca183bb2f0c9ac..02a7d032779c8f37702c9513f1c3fbb988088677:/src/mc/mc_snapshot.cpp

diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp
index 327376640d..5a101b92ce 100644
--- a/src/mc/mc_snapshot.cpp
+++ b/src/mc/mc_snapshot.cpp
@@ -12,7 +12,7 @@
 #include "mc_snapshot.h"
 #include "mc_private.h"
 #include "mc_mmu.h"
-#include "mc_page_store.h"
+#include "PageStore.hpp"
 
 extern "C" {
 
@@ -23,7 +23,8 @@ extern "C" {
  *  @param Snapshot region in the snapshot this pointer belongs to
  *         (or NULL if it does not belong to any snapshot region)
  * */
-mc_mem_region_t mc_get_snapshot_region(const void* addr, mc_snapshot_t snapshot, int process_index)
+mc_mem_region_t mc_get_snapshot_region(
+  const void* addr, const s_mc_snapshot_t* snapshot, int process_index)
 {
   size_t n = snapshot->snapshot_regions_count;
   for (size_t i = 0; i != n; ++i) {
@@ -34,16 +35,16 @@ mc_mem_region_t mc_get_snapshot_region(const void* addr, mc_snapshot_t snapshot,
     if (region->storage_type == MC_REGION_STORAGE_TYPE_PRIVATIZED) {
 #ifdef HAVE_SMPI
       // Use the current process index of the snapshot:
-      if (process_index == MC_PROCESS_INDEX_DISABLED) {
+      if (process_index == simgrid::mc::ProcessIndexDisabled) {
         process_index = snapshot->privatization_index;
       }
       if (process_index < 0) {
         xbt_die("Missing process index");
       }
-      if (process_index >= (int) region->privatized.regions_count) {
+      if (process_index >= (int) region->privatized_regions_.size()) {
         xbt_die("Invalid process index");
       }
-      mc_mem_region_t priv_region = region->privatized.regions[process_index];
+      mc_mem_region_t priv_region = region->privatized_regions_[process_index].get();
       xbt_assert(mc_region_contain(priv_region, addr));
       return priv_region;
 #else
@@ -81,7 +82,7 @@ const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, cons
 
   // Read each page:
   while (mc_page_number(NULL, addr) != page_end) {
-    void* snapshot_addr = mc_translate_address_region((uintptr_t) addr, region);
+    void* snapshot_addr = mc_translate_address_region_chunked((uintptr_t) addr, region);
     void* next_page = mc_page_from_number(NULL, mc_page_number(NULL, addr) + 1);
     size_t readable = (char*) next_page - (char*) addr;
     memcpy(dest, snapshot_addr, readable);
@@ -91,31 +92,12 @@ const void* MC_region_read_fragmented(mc_mem_region_t region, void* target, cons
   }
 
   // Read the end:
-  void* snapshot_addr = mc_translate_address_region((uintptr_t)addr, region);
+  void* snapshot_addr = mc_translate_address_region_chunked((uintptr_t)addr, region);
   memcpy(dest, snapshot_addr, size);
 
   return target;
 }
 
-/** @brief Read memory from a snapshot
- *
- *  @param addr     Process (non-snapshot) address of the data
- *  @param snapshot Snapshot (or NULL is no snapshot)
- *  @param target   Buffer to store the value
- *  @param size     Size of the data to read in bytes
- *  @return Pointer where the data is located (target buffer or original location)
- */
-const void* MC_snapshot_read(
-  mc_snapshot_t snapshot, adress_space_read_flags_t flags,
-  void* target, const void* addr, size_t size, int process_index)
-{
-  mc_mem_region_t region = mc_get_snapshot_region(addr, snapshot, process_index);
-  if (region)
-    return MC_region_read(region, target, addr, size);
-  else
-    return MC_process_read(snapshot->process, flags, target, addr, size, process_index);
-}
-
 /** Compare memory between snapshots (with known regions)
  *
  * @param addr1 Address in the first snapshot
@@ -168,6 +150,60 @@ int MC_snapshot_memcmp(
   return MC_snapshot_region_memcmp(addr1, region1, addr2, region2, size);
 }
 
+namespace simgrid {
+namespace mc {
+
+Snapshot::Snapshot() :
+  process(nullptr),
+  num_state(0),
+  heap_bytes_used(0),
+  snapshot_regions(nullptr),
+  snapshot_regions_count(0),
+  enabled_processes(0),
+  privatization_index(0),
+  stack_sizes(nullptr),
+  stacks(nullptr),
+  to_ignore(nullptr),
+  hash(0),
+  ignored_data(nullptr),
+  total_fd(0),
+  current_fd(nullptr)
+{
+
+}
+Snapshot::~Snapshot()
+{
+  for (size_t i = 0; i < this->snapshot_regions_count; i++) {
+    delete this->snapshot_regions[i];
+  }
+  xbt_free(this->snapshot_regions);
+  xbt_free(this->stack_sizes);
+  xbt_dynar_free(&(this->stacks));
+  xbt_dynar_free(&(this->to_ignore));
+  xbt_dynar_free(&this->ignored_data);
+}
+
+const void* Snapshot::read_bytes(void* buffer, std::size_t size,
+  remote_ptr<void> address, int process_index,
+  AddressSpace::ReadMode mode) const
+{
+  mc_mem_region_t region = mc_get_snapshot_region((void*)address.address(), this, process_index);
+  if (region) {
+    const void* res = MC_region_read(region, buffer, (void*)address.address(), size);
+    if (buffer == res || mode == AddressSpace::Lazy)
+      return res;
+    else {
+      memcpy(buffer, res, size);
+      return buffer;
+    }
+  }
+  else
+    return this->read_bytes(buffer, size, address, process_index, mode);
+}
+
+}
+}
+
 #ifdef SIMGRID_TEST
 
 #include <string.h>
@@ -193,27 +229,23 @@ static inline void init_memory(void* mem, size_t size)
 
 static void test_snapshot(bool sparse_checkpoint);
 
-XBT_TEST_UNIT("page_snapshots", test_per_snpashots, "Test per-page snapshots")
-{
-  test_snapshot(1);
-}
-
-
 XBT_TEST_UNIT("flat_snapshot", test_flat_snapshots, "Test flat snapshots")
 {
   test_snapshot(0);
 }
 
+XBT_TEST_UNIT("page_snapshots", test_per_snpashots, "Test per-page snapshots")
+{
+  test_snapshot(1);
+}
 
 static void test_snapshot(bool sparse_checkpoint) {
 
   xbt_test_add("Initialisation");
-  _sg_mc_soft_dirty = 0;
   _sg_mc_sparse_checkpoint = sparse_checkpoint;
   xbt_assert(xbt_pagesize == getpagesize());
   xbt_assert(1 << xbt_pagebits == xbt_pagesize);
-  mc_model_checker = xbt_new0(s_mc_model_checker_t, 1);
-  mc_model_checker->pages = mc_pages_store_new();
+  mc_model_checker = new ::simgrid::mc::ModelChecker(getpid(), -1);
 
   for(int n=1; n!=256; ++n) {
 
@@ -224,17 +256,19 @@ static void test_snapshot(bool sparse_checkpoint) {
 
     // Init memory and take snapshots:
     init_memory(source, byte_size);
-    mc_mem_region_t region0 = mc_region_new_sparse(MC_REGION_TYPE_UNKNOWN, source, source, byte_size, NULL);
+    mc_mem_region_t region0 = mc_region_new_sparse(
+      MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
     for(int i=0; i<n; i+=2) {
       init_memory((char*) source + i*xbt_pagesize, xbt_pagesize);
     }
-    mc_mem_region_t region = mc_region_new_sparse(MC_REGION_TYPE_UNKNOWN, source, source, byte_size, NULL);
+    mc_mem_region_t region = mc_region_new_sparse(
+      MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
 
     void* destination = mmap(NULL, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
     xbt_assert(source!=MAP_FAILED, "Could not allocate destination memory");
 
     xbt_test_add("Reading whole region data for %i page(s)", n);
-    const void* read = MC_region_read(region, source, destination, byte_size);
+    const void* read = MC_region_read(region, destination, source, byte_size);
     xbt_test_assert(!memcmp(source, read, byte_size), "Mismatch in MC_region_read()");
 
     xbt_test_add("Reading parts of region data for %i page(s)", n);
@@ -247,19 +281,10 @@ static void test_snapshot(bool sparse_checkpoint) {
     }
 
     xbt_test_add("Compare whole region data for %i page(s)", n);
-    xbt_test_assert(!MC_snapshot_region_memcmp(source, NULL, source, region, byte_size),
-      "Mismatch in MC_snapshot_region_memcmp() for the whole region");
+
     xbt_test_assert(MC_snapshot_region_memcmp(source, region0, source, region, byte_size),
       "Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
 
-    xbt_test_add("Compare parts of region data for %i page(s) with current value", n);
-    for(int j=0; j!=100; ++j) {
-      size_t offset = rand() % byte_size;
-      size_t size = rand() % (byte_size - offset);
-      xbt_test_assert(!MC_snapshot_region_memcmp((char*) source+offset, NULL, (char*) source+offset, region, size),
-        "Mismatch in MC_snapshot_region_memcmp()");
-    }
-
     xbt_test_add("Compare parts of region data for %i page(s) with itself", n);
     for(int j=0; j!=100; ++j) {
       size_t offset = rand() % byte_size;
@@ -271,20 +296,20 @@ static void test_snapshot(bool sparse_checkpoint) {
     if (n==1) {
       xbt_test_add("Read pointer for %i page(s)", n);
       memcpy(source, &mc_model_checker, sizeof(void*));
-      mc_mem_region_t region2 = mc_region_new_sparse(MC_REGION_TYPE_UNKNOWN, source, source, byte_size, NULL);
+      mc_mem_region_t region2 = mc_region_new_sparse(
+        MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
       xbt_test_assert(MC_region_read_pointer(region2, source) == mc_model_checker,
         "Mismtach in MC_region_read_pointer()");
-      MC_region_destroy(region2);
+      delete region2;
     }
 
-    MC_region_destroy(region);
-    MC_region_destroy(region0);
+    delete region;
+    delete region0;
     munmap(destination, byte_size);
     munmap(source, byte_size);
   }
 
-  mc_pages_store_delete(mc_model_checker->pages);
-  xbt_free(mc_model_checker);
+  delete mc_model_checker;
   mc_model_checker = NULL;
 }