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

diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp
index 345e23b23d..5a101b92ce 100644
--- a/src/mc/mc_snapshot.cpp
+++ b/src/mc/mc_snapshot.cpp
@@ -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,7 +92,7 @@ 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;
@@ -173,7 +174,7 @@ Snapshot::Snapshot() :
 Snapshot::~Snapshot()
 {
   for (size_t i = 0; i < this->snapshot_regions_count; i++) {
-    MC_region_destroy(this->snapshot_regions[i]);
+    delete this->snapshot_regions[i];
   }
   xbt_free(this->snapshot_regions);
   xbt_free(this->stack_sizes);
@@ -183,14 +184,21 @@ Snapshot::~Snapshot()
 }
 
 const void* Snapshot::read_bytes(void* buffer, std::size_t size,
-  std::uint64_t address, int process_index,
-  AddressSpace::ReadMode mode)
+  remote_ptr<void> address, int process_index,
+  AddressSpace::ReadMode mode) const
 {
-  mc_mem_region_t region = mc_get_snapshot_region((void*)address, this, process_index);
-  if (region)
-    return MC_region_read(region, buffer, (void*)address, size);
+  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 MC_process_read(this->process, mode, buffer, (void*)address, size, process_index);
+    return this->read_bytes(buffer, size, address, process_index, mode);
 }
 
 }
@@ -273,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;
@@ -301,11 +300,11 @@ static void test_snapshot(bool sparse_checkpoint) {
         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);
   }