X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a75c48b9362dfc8b1cfcc329885943d85e42464e..b0d07f67c6153ee2689bc22486c95becf4286493:/src/mc/sosp/PageStore.cpp

diff --git a/src/mc/sosp/PageStore.cpp b/src/mc/sosp/PageStore.cpp
index 98c930818a..e3702c83f8 100644
--- a/src/mc/sosp/PageStore.cpp
+++ b/src/mc/sosp/PageStore.cpp
@@ -8,30 +8,35 @@
 #define MAP_POPULATE MAP_PREFAULT_READ
 #endif
 
+#include "src/internal_config.h"
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
 
-#include "src/mc/sosp/PageStore.hpp"
+#ifdef SG_HAVE_CPP14
+#include "src/include/xxhash.hpp"
+#endif
 #include "src/mc/mc_mmu.hpp"
+#include "src/mc/sosp/PageStore.hpp"
 
 #include <cstring> // memcpy, memcmp
 #include <unistd.h>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, "Logging specific to mc_page_snapshot");
-
 namespace simgrid {
 namespace mc {
 
 /** @brief Compute a hash for the given memory page
  *
- *  The page is used before inserting the page in the page store
- *  in order to find duplicate of this page in the page store.
+ *  The page is used before inserting the page in the page store in order to find duplicate of this page in the page
+ *  store.
  *
  *  @param data Memory page
  *  @return hash off the page
  */
 static XBT_ALWAYS_INLINE PageStore::hash_type mc_hash_page(const void* data)
 {
+#ifdef SG_HAVE_CPP14
+  return xxh::xxhash<64>(data, xbt_pagesize);
+#else
   const std::uint64_t* values = (const uint64_t*)data;
   std::size_t n               = xbt_pagesize / sizeof(uint64_t);
 
@@ -40,6 +45,7 @@ static XBT_ALWAYS_INLINE PageStore::hash_type mc_hash_page(const void* data)
   for (std::size_t i = 0; i != n; ++i)
     hash = ((hash << 5) + hash) + values[i];
   return hash;
+#endif
 }
 
 // ***** snapshot_page_manager
@@ -84,7 +90,7 @@ void PageStore::resize(std::size_t size)
     // Check if expanding worked
     if (new_memory != (char*)this->memory_ + old_bytesize) {
       // New memory segment could not be put at the end of this->memory_,
-      // so cancel this one and try to rellocate everything and copy data
+      // so cancel this one and try to relocate everything and copy data
       munmap(new_memory, new_bytesize - old_bytesize);
       new_memory =
           mmap(nullptr, new_bytesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0);
@@ -112,7 +118,6 @@ void PageStore::resize(std::size_t size)
 std::size_t PageStore::alloc_page()
 {
   if (this->free_pages_.empty()) {
-
     // Expand the region:
     if (this->top_index_ == this->capacity_)
       // All the pages are allocated, we need add more pages:
@@ -120,9 +125,7 @@ std::size_t PageStore::alloc_page()
 
     // Use a page from the top:
     return this->top_index_++;
-
   } else {
-
     // Use a page from free_pages_ (inside of the region):
     size_t res = this->free_pages_[this->free_pages_.size() - 1];
     this->free_pages_.pop_back();
@@ -154,7 +157,6 @@ std::size_t PageStore::store_page(void* page)
   for (size_t const& pageno : page_set) {
     const void* snapshot_page = this->get_page(pageno);
     if (memcmp(page, snapshot_page, xbt_pagesize) == 0) {
-
       // If a page with the same content is already in the page store it's reused and its refcount is incremented.
       page_counts_[pageno]++;
       return pageno;
@@ -164,7 +166,7 @@ std::size_t PageStore::store_page(void* page)
   // Otherwise, a new page is allocated in the page store and the content of the page is `memcpy()`-ed to this new page.
   std::size_t pageno = alloc_page();
   xbt_assert(this->page_counts_[pageno] == 0, "Allocated page is already used");
-  void* snapshot_page = (void*)this->get_page(pageno);
+  void* snapshot_page = this->get_page(pageno);
   memcpy(snapshot_page, page, xbt_pagesize);
   page_set.insert(pageno);
   page_counts_[pageno]++;