X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87bf71ddfe2611ffedaabe6c3a9030957ae4a080..b24e3ced733a04e94b8045ddc66a8bcae0b69422:/src/surf/surf_config.c diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index 7f5e6fb3bb..b1cc745077 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -152,6 +152,11 @@ static void _surf_cfg_cb_model_check(const char *name, int pos) { 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 static void _surf_cfg_cb__gtnets_jitter(const char *name, int pos){ sg_gtnets_jitter = xbt_cfg_get_double(_surf_cfg_set, name); @@ -260,6 +265,12 @@ void surf_config_init(int *argc, char **argv) "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); + 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", "Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)", xbt_cfgelm_double, @@ -311,6 +322,10 @@ void surf_config_models_setup(const char *platform_file) 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";