From 44c97ec3c59d9ac2cfca8cf5911531421dae439b Mon Sep 17 00:00:00 2001 From: thiery Date: Tue, 15 Feb 2011 10:01:50 +0000 Subject: [PATCH 1/1] Consider the value of the cfg=model-checker flag git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9623 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/surf_config.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index dd4c08c88c..d35005cfed 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -183,10 +183,13 @@ extern int _surf_do_model_check; /* this variable lives in xbt_main until I fi static void _surf_cfg_cb_model_check(const char *name, int pos) { - _surf_do_model_check = 1; - /* Tell modules using mallocators that they shouldn't. MC don't like them */ - xbt_fifo_preinit(); - xbt_dict_preinit(); + _surf_do_model_check = xbt_cfg_get_int(_surf_cfg_set, name); + + if (_surf_do_model_check) { + /* Tell modules using mallocators that they shouldn't. MC don't like them */ + xbt_fifo_preinit(); + xbt_dict_preinit(); + } } static void _surf_cfg_cb_context_factory(const char *name, int pos) -- 2.20.1