X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5838ca84fc5da29f60e79a41454680735eece98f..f42358a7200f087c9047de7c7eaca0ad7d907c5c:/src/mc/mc_page_store.h

diff --git a/src/mc/mc_page_store.h b/src/mc/mc_page_store.h
index de67f55da2..45965e7d6d 100644
--- a/src/mc/mc_page_store.h
+++ b/src/mc/mc_page_store.h
@@ -9,6 +9,7 @@
 #ifdef __cplusplus
 #include <vector>
 
+#include <boost/array.hpp>
 #include <boost/utility.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
@@ -16,11 +17,10 @@
 
 #include <xbt.h>
 
-#include "mc_private.h"
 #include "mc_mmu.h"
 
-#ifndef MC_PAGE_SNAPSHOT_H
-#define MC_PAGE_SNAPSHOT_H
+#ifndef MC_PAGE_STORE_H
+#define MC_PAGE_STORE_H
 
 struct s_mc_pages_store;
 
@@ -79,10 +79,25 @@ struct s_mc_pages_store;
  *
  */
 struct s_mc_pages_store {
-private: // Types
+public: // Types
+#ifdef MC_PAGE_STORE_MD4
+  typedef boost::array<uint64_t,2> hash_type;
+#else
   typedef uint64_t hash_type;
-  typedef boost ::unordered_set<size_t> page_set_type;
+#endif
+private: // Types
+#ifdef MC_PAGE_STORE_MD4
+  // We are using a secure hash to identify a page.
+  // We assume there will not be any collision: we need to map a hash
+  // to a single page index.
+  typedef boost::unordered_map<hash_type, size_t> pages_map_type;
+#else
+  // We are using a cheap hash to index a page.
+  // We should expect collision and we need to associate multiple page indices
+  // to the same hash.
+  typedef boost::unordered_set<size_t> page_set_type;
   typedef boost::unordered_map<hash_type, page_set_type> pages_map_type;
+#endif
 
 private: // Fields:
   /** First page
@@ -195,6 +210,12 @@ size_t s_mc_pages_store::capacity() {
 
 #endif
 
+SG_BEGIN_DECL()
+
+typedef struct s_mc_pages_store s_mc_pages_store_t, * mc_pages_store_t;
+mc_pages_store_t mc_pages_store_new(void);
+void mc_pages_store_delete(mc_pages_store_t store);
+
 /**
  */
 static inline __attribute__((always_inline))
@@ -205,4 +226,6 @@ const void* mc_page_store_get_page(mc_pages_store_t page_store, size_t pageno)
   return mc_page_from_number(memory, pageno);
 }
 
+SG_END_DECL()
+
 #endif