Do not call xbt_cfg_set_int on the model-check option, it won't set it's value to...

[simgrid.git] / src / surf / surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 68fb17e..dab8332 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -142,10 +142,19 @@ static void _surf_cfg_cb__surf_path(const char *name, int pos) {
 }
 
 /* callback to decide if we want to use the model-checking */
+#include "xbt_modinter.h"
 int _surf_do_model_check = 0; /* this variable is used accros the lib */
 
 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();
+}
+
+static void _surf_cfg_cb__surf_network_fullduplex(const char *name, int pos)
+{
+       sg_network_fullduplex = xbt_cfg_get_int(_surf_cfg_set, name);
 }
 
 #ifdef HAVE_GTNETS
@@ -160,17 +169,16 @@ static void _surf_cfg_cb__gtnets_jitter_seed(const char *name, int pos){
 /* create the config set, register what should be and parse the command line*/
 void surf_config_init(int *argc, char **argv)
 {
-
-  /* Create the configuration support */
-  if (_surf_init_status == 0) { /* Only create stuff if not already inited */
-    _surf_init_status = 1;
-
     char *description = xbt_malloc(1024), *p = description;
     char *default_value;
     double double_default_value;
        int default_value_int;
     int i;
 
+  /* Create the configuration support */
+  if (_surf_init_status == 0) { /* Only create stuff if not already inited */
+    _surf_init_status = 1;
+
     sprintf(description, "The model to use for the CPU. Possible values: ");
     p = description;
     while (*(++p) != '\0');
@@ -256,6 +264,17 @@ void surf_config_init(int *argc, char **argv)
     xbt_cfg_register(&_surf_cfg_set, "model-check",
                      "Activate the model-checking of the \"simulated\" system (EXPERIMENTAL -- msg only for now)",
                      xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb_model_check, NULL);
+    /*
+     FIXME: this function is not setting model-check to it's default value because
+     internally it calls to variable->cb_set that in this case is the function 
+     _surf_cfg_cb_model_check which sets it's value to 1 (instead of the defalut value 0)
+     xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */
+
+    default_value_int = 0;
+    xbt_cfg_register(&_surf_cfg_set, "fullduplex",
+                    "Update the constraint set propagating recursively to others constraints",
+                    xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__surf_network_fullduplex, NULL);
+    xbt_cfg_set_int(_surf_cfg_set, "fullduplex", default_value_int);
 
 #ifdef HAVE_GTNETS
     xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter",
@@ -299,14 +318,19 @@ void surf_config_models_setup(const char *platform_file)
 {
   char *workstation_model_name;
   int workstation_id = -1;
-
+  char *network_model_name = NULL;
+  char *cpu_model_name = NULL;
   surf_timer_model_init(platform_file);
 
   workstation_model_name =
     xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
-  char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network/model");
-  char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
+  network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network/model");
+  cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
 
+  /* Check whether we use a net/cpu model differing from the default ones, in which case
+   * we should switch to the "compound" workstation model to correctly dispatch stuff to
+   * the right net/cpu models.
+   */
   if ((strcmp(network_model_name,"LV08") || strcmp(cpu_model_name,"Cas01"))
       && !strcmp(workstation_model_name, "CLM03")){
     const char *val = "compound";