[mc] Remove content addressable page store

[simgrid.git] / src / mc / PageStore.cpp

diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp
index 05df2a8..e8c74ac 100644 (file)
--- a/src/mc/PageStore.cpp
+++ b/src/mc/PageStore.cpp
@@ -15,10 +15,6 @@
 
 #include "PageStore.hpp"
 
-#ifdef MC_PAGE_STORE_MD4
-#include <nettle/md4.h>
-#endif
-
 #include "mc_mmu.h"
 
 extern "C" {
@@ -40,14 +36,6 @@ namespace mc {
 static inline  __attribute__ ((always_inline))
 PageStore::hash_type mc_hash_page(const void* data)
 {
-#ifdef MC_PAGE_STORE_MD4
-   boost::array<uint64_t,2> result;
-   md4_ctx context;
-   md4_init(&context);
-   md4_update(&context, xbt_pagesize, (const uint8_t*) data);
-   md4_digest(&context, MD4_DIGEST_SIZE, (uint8_t*) &(result[0]));
-   return result;
-#else
   const uint64_t* values = (const uint64_t*) data;
   size_t n = xbt_pagesize / sizeof(uint64_t);
 
@@ -57,7 +45,6 @@ PageStore::hash_type mc_hash_page(const void* data)
     hash = ((hash << 5) + hash) + values[i];
   }
   return hash;
-#endif
 }
 
 // ***** snapshot_page_manager
@@ -133,11 +120,7 @@ void PageStore::remove_page(size_t pageno)
   this->free_pages_.push_back(pageno);
   const void* page = this->get_page(pageno);
   hash_type hash = mc_hash_page(page);
-#ifdef MC_PAGE_STORE_MD4
-  this->hash_index_.erase(hash);
-#else
   this->hash_index_[hash].erase(pageno);
-#endif
 }
 
 /** Store a page in memory */
@@ -151,17 +134,6 @@ size_t PageStore::store_page(void* page)
   //  2. find pages with the same hash using `hash_index_`;
   //  3. find a page with the same content.
   hash_type hash = mc_hash_page(page);
-#ifdef MC_PAGE_STORE_MD4
-  s_mc_pages_store::pages_map_type::const_iterator i =
-    this->hash_index_.find(hash);
-  if (i!=this->hash_index_.cend()) {
-    // If a page with the same content is already in the page store it is
-    // reused and its reference count is incremented.
-    size_t pageno = i->second;
-    page_counts_[pageno]++;
-    return pageno;
-  }
-#else
 
   // Try to find a duplicate in set of pages with the same hash:
   page_set_type& page_set = this->hash_index_[hash];
@@ -176,7 +148,6 @@ size_t PageStore::store_page(void* page)
 
     }
   }
-#endif
 
   // Otherwise, a new page is allocated in the page store and the content
   // of the page is `memcpy()`-ed to this new page.
@@ -184,11 +155,7 @@ size_t PageStore::store_page(void* page)
   xbt_assert(this->page_counts_[pageno]==0, "Allocated page is already used");
   void* snapshot_page = (void*) this->get_page(pageno);
   memcpy(snapshot_page, page, xbt_pagesize);
-#ifdef MC_PAGE_STORE_MD4
-  this->hash_index_[hash] = pageno;
-#else
   page_set.insert(pageno);
-#endif
   page_counts_[pageno]++;
   return pageno;
 }