Merge branch 'master' into mc

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

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 061ca74..b78bf83 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,7 +7,7 @@
 #include <cassert>
 
 #include "ModelChecker.hpp"
-#include "mc_page_store.h"
+#include "PageStore.hpp"
 
 ::simgrid::mc::ModelChecker* mc_model_checker = NULL;
 
@@ -15,18 +15,14 @@ namespace simgrid {
 namespace mc {
 
 ModelChecker::ModelChecker(pid_t pid, int socket)
+  : page_store_(500)
 {
-  this->page_store_ = mc_pages_store_new();
-  this->fd_clear_refs_ = -1;
   this->hostnames_ = xbt_dict_new();
   MC_process_init(&this->process(), pid, socket);
 }
 
 ModelChecker::~ModelChecker()
 {
-  mc_pages_store_delete(this->page_store_);
-  if(this->record_)
-    xbt_dynar_free(&this->record_);
   MC_process_clear(&this->process_);
   xbt_dict_free(&this->hostnames_);
 }