From 900cb23da16eeaad345fd16101f2ea986f2706bd Mon Sep 17 00:00:00 2001
From: cristianrosa <cristianrosa@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sat, 8 May 2010 14:29:22 +0000
Subject: [PATCH] Bugfix: initialize the model checker memory subsystem after
 parsing the configuration

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7724 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/surf/surf.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/surf/surf.c b/src/surf/surf.c
index a963b61d1e..5b603282d2 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -252,11 +252,7 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
 #endif
 
 void surf_init(int *argc, char **argv)
-{
-
-  if (_surf_do_model_check)
-    MC_memory_init();
-  
+{ 
   /* Connect our log channels: that must be done manually under windows */
   XBT_LOG_CONNECT(surf_cpu, surf);
   XBT_LOG_CONNECT(surf_kernel, surf);
@@ -282,6 +278,9 @@ void surf_init(int *argc, char **argv)
     history = tmgr_history_new();
 
   surf_config_init(argc, argv);
+
+  if (_surf_do_model_check)
+    MC_memory_init();
 }
 
 #ifdef WIN32
-- 
2.20.1