X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8173f52406580284c8ec5feab41784a8f4aed8ce..6bec471e8974b7d02a0f35ec27067595403f5e1e:/src/mc/mc_snapshot.h

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 7d5654b569..d186663b5a 100644
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -110,7 +110,7 @@ bool mc_region_contain(mc_mem_region_t region, const void* p)
 }
 
 static inline __attribute__((always_inline))
-void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region)
+void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region)
 {
   size_t pageno = mc_page_number(region->start_addr, (void*) addr);
   size_t snapshot_pageno = region->chunked.page_numbers[pageno];
@@ -119,8 +119,38 @@ void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region)
   return (char*) snapshot_page + mc_page_offset((void*) addr);
 }
 
+static inline __attribute__((always_inline))
+void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index)
+{
+  switch (region->storage_type) {
+  case MC_REGION_STORAGE_TYPE_NONE:
+  default:
+    xbt_die("Storage type not supported");
+
+  case MC_REGION_STORAGE_TYPE_FLAT:
+    {
+      uintptr_t offset = addr - (uintptr_t) region->start_addr;
+      return (void *) ((uintptr_t) region->flat.data + offset);
+    }
+
+  case MC_REGION_STORAGE_TYPE_CHUNKED:
+    return mc_translate_address_region_chunked(addr, region);
+
+  case MC_REGION_STORAGE_TYPE_PRIVATIZED:
+    {
+      xbt_assert(process_index >=0,
+        "Missing process index for privatized region");
+      xbt_assert((size_t) process_index < region->privatized.regions_count,
+        "Out of range process index");
+      mc_mem_region_t subregion = region->privatized.regions[process_index];
+      xbt_assert(subregion, "Missing memory region for process %i", process_index);
+      return mc_translate_address_region(addr, subregion, process_index);
+    }
+  }
+}
+
 XBT_INTERNAL mc_mem_region_t mc_get_snapshot_region(
-  const void* addr, mc_snapshot_t snapshot, int process_index);
+  const void* addr, const s_mc_snapshot_t *snapshot, int process_index);
 
 /** \brief Translate a pointer from process address space to snapshot address space
  *
@@ -148,35 +178,11 @@ void* mc_translate_address(uintptr_t addr, mc_snapshot_t snapshot, int process_i
 
   xbt_assert(mc_region_contain(region, (void*) addr), "Trying to read out of the region boundary.");
 
-  if (!region) {
+  if (!region)
+    // TODO, This is not correct anymore in the cross process model?
     return (void *) addr;
-  }
-
-  switch (region->storage_type) {
-  case MC_REGION_STORAGE_TYPE_NONE:
-  default:
-    xbt_die("Storage type not supported");
-
-  case MC_REGION_STORAGE_TYPE_FLAT:
-    {
-      uintptr_t offset = addr - (uintptr_t) region->start_addr;
-      return (void *) ((uintptr_t) region->flat.data + offset);
-    }
-
-  case MC_REGION_STORAGE_TYPE_CHUNKED:
-    return mc_translate_address_region(addr, region);
-
-  case MC_REGION_STORAGE_TYPE_PRIVATIZED:
-    {
-      xbt_assert(process_index >=0,
-        "Missing process index for privatized region");
-      xbt_assert((size_t) process_index < region->privatized.regions_count,
-        "Out of range process index");
-      mc_mem_region_t subregion = region->privatized.regions[process_index];
-      xbt_assert(subregion, "Missing memory region for process %i", process_index);
-      return mc_translate_address(addr, snapshot, process_index);
-    }
-  }
+  else
+    return mc_translate_address_region(addr, region, process_index);
 }
 
 // ***** MC Snapshot
@@ -209,8 +215,8 @@ public:
   Snapshot();
   ~Snapshot();
   const void* read_bytes(void* buffer, std::size_t size,
-    std::uint64_t address, int process_index = ProcessIndexAny,
-    ReadMode mode = Normal) override;
+    remote_ptr<void> address, int process_index = ProcessIndexAny,
+    ReadMode mode = Normal) const MC_OVERRIDE;
 public: // To be private
   mc_process_t process;
   int num_state;
@@ -274,11 +280,6 @@ typedef struct s_mc_global_t {
   char *recv_diff;
 }s_mc_global_t, *mc_global_t;
 
-typedef struct s_mc_checkpoint_ignore_region{
-  void *addr;
-  size_t size;
-}s_mc_checkpoint_ignore_region_t, *mc_checkpoint_ignore_region_t;
-
 static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
 
 XBT_INTERNAL mc_snapshot_t MC_take_snapshot(int num_state);
@@ -300,7 +301,8 @@ const void* MC_snapshot_read(mc_snapshot_t snapshot,
   simgrid::mc::AddressSpace::ReadMode mode,
   void* target, const void* addr, size_t size, int process_index)
 {
-  return snapshot->read_bytes(target, size, (uint64_t)addr, process_index, mode);
+  return snapshot->read_bytes(target, size, simgrid::mc::remote(addr),
+    process_index, mode);
 }
 
 MC_SHOULD_BE_INTERNAL int MC_snapshot_region_memcmp(
@@ -310,20 +312,12 @@ XBT_INTERNAL int MC_snapshot_memcmp(
   const void* addr1, mc_snapshot_t snapshot1,
   const void* addr2, mc_snapshot_t snapshot2, int process_index, size_t size);
 
-static inline __attribute__ ((always_inline))
-const void* MC_snapshot_read_pointer(mc_snapshot_t snapshot, const void* addr, int process_index)
-{
-  void* res;
-  return *(const void**) MC_snapshot_read(snapshot, simgrid::mc::AddressSpace::Lazy,
-    &res, addr, sizeof(void*), process_index);
-}
-
 static inline __attribute__ ((always_inline))
 const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot)
 {
   if(snapshot==NULL)
       xbt_die("snapshot is NULL");
-  return MC_process_get_heap(&mc_model_checker->process())->breakval;
+  return mc_model_checker->process().get_heap()->breakval;
 }
 
 /** @brief Read memory from a snapshot region
@@ -358,7 +352,7 @@ const void* MC_region_read(mc_mem_region_t region, void* target, const void* add
       void* end = (char*) addr + size - 1;
       if (mc_same_page(addr, end) ) {
         // The memory is contained in a single page:
-        return mc_translate_address_region((uintptr_t) addr, region);
+        return mc_translate_address_region_chunked((uintptr_t) addr, region);
       } else {
         // The memory spans several pages:
         return MC_region_read_fragmented(region, target, addr, size);