X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3400fc8e74d6ccf632346df99770baf940a1bedc..13025e8ea0f4fccfb16bc3214ed42aefa1b8d9d9:/src/surf/surf_config.c diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index f7d686ec9a..23de181fb9 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -9,6 +9,7 @@ #include "xbt/config.h" #include "xbt/str.h" #include "surf/surf_private.h" +#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */ #include "simix/context.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, @@ -36,24 +37,18 @@ static void surf_config_cmd_line(int *argc, char **argv) printf ("Description of the configuration accepted by this simulator:\n"); xbt_cfg_help(_surf_cfg_set); - printf - ("\nYou can also use --help-models to see the details of all models known by this simulator.\n"); + printf("\nYou can also use --help-models to see the details of all models known by this simulator.\n"); #ifdef HAVE_TRACING - printf - ("\nYou can also use --help-tracing to see the details of all tracing options known by this simulator.\n"); + printf("\nYou can also use --help-tracing to see the details of all tracing options known by this simulator.\n"); #endif exit(0); - } else - if (!strncmp - (argv[i], "--help-models", strlen("--help-models") + 1)) { + } else if (!strncmp(argv[i], "--help-models", strlen("--help-models") + 1)) { model_help("workstation", surf_workstation_model_description); model_help("CPU", surf_cpu_model_description); model_help("network", surf_network_model_description); exit(0); #ifdef HAVE_TRACING - }else - if (!strncmp - (argv[i], "--help-tracing", strlen("--help-tracing") + 1)) { + } else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) { TRACE_help (1); exit(0); #endif @@ -220,6 +215,23 @@ static void _surf_cfg_cb_contexts_parallel_threshold(const char *name, int pos) SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(_surf_cfg_set, name)); } +static void _surf_cfg_cb__surf_network_coordinates(const char *name, + int pos) +{ + char *val = xbt_cfg_get_string(_surf_cfg_set, name); + if (!strcmp(val, "yes")) { + if (!COORD_HOST_LEVEL) { + COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp); + COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp); + } + } else if (!strcmp(val, "no")) { + if (COORD_HOST_LEVEL) + XBT_WARN("Cannot disable CMD prop coordinates, once set."); + } else { + XBT_WARN("Setting CMD prop coordinates must be \"yes\" or \"no\""); + } +} + static void _surf_cfg_cb__surf_network_fullduplex(const char *name, int pos) { @@ -393,13 +405,20 @@ void surf_config_init(int *argc, char **argv) /* minimal number of user contexts to be run in parallel */ default_value_int = 1; xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_threshold", - "Minimal number of user contexts to be run in parallel", + "Minimal number of user contexts to be run in parallel (raw contexts only)", xbt_cfgelm_int, &default_value_int, 1, 1, _surf_cfg_cb_contexts_parallel_threshold, NULL); + default_value = xbt_strdup("no"); + xbt_cfg_register(&_surf_cfg_set, "coordinates", + "\"yes\" or \"no\" (FIXME: document)", + xbt_cfgelm_string, &default_value, 1, 1, + _surf_cfg_cb__surf_network_coordinates, NULL); + xbt_cfg_setdefault_string(_surf_cfg_set, "coordinates", default_value); + default_value_int = 0; xbt_cfg_register(&_surf_cfg_set, "fullduplex", - "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM03)", + "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)", xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__surf_network_fullduplex, NULL); xbt_cfg_setdefault_int(_surf_cfg_set, "fullduplex", default_value_int); @@ -417,7 +436,13 @@ void surf_config_init(int *argc, char **argv) xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__gtnets_jitter_seed, NULL); #endif - +#ifdef HAVE_NS3 + xbt_cfg_register(&_surf_cfg_set, "ns3/TcpModel", + "The ns3 tcp model can be : NewReno or Reno or Tahoe", + xbt_cfgelm_string, NULL, 1, 1, + NULL, NULL); + xbt_cfg_setdefault_string(_surf_cfg_set, "ns3/TcpModel", "default"); +#endif if (!surf_path) { /* retrieves the current directory of the current process */ const char *initial_path = __surf_get_initial_path(); @@ -444,7 +469,8 @@ void surf_config_finalize(void) _surf_init_status = 0; } -void surf_config_models_setup(const char *platform_file) +/* Pick the right models for CPU, net and workstation, and call their model_init_preparse */ +void surf_config_models_setup() { char *workstation_model_name; int workstation_id = -1; @@ -492,25 +518,10 @@ void surf_config_models_setup(const char *platform_file) cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name); - surf_cpu_model_description[cpu_id].model_init_preparse(platform_file); - surf_network_model_description[network_id].model_init_preparse - (platform_file); + surf_cpu_model_description[cpu_id].model_init_preparse(); + surf_network_model_description[network_id].model_init_preparse(); } XBT_DEBUG("Call workstation_model_init"); - surf_workstation_model_description[workstation_id].model_init_preparse - (platform_file); -} - -void surf_config_models_create_elms(void) -{ - char *workstation_model_name = - xbt_cfg_get_string(_surf_cfg_set, "workstation/model"); - int workstation_id = - find_model_description(surf_workstation_model_description, - workstation_model_name); - if (surf_workstation_model_description - [workstation_id].model_init_postparse != NULL) - surf_workstation_model_description[workstation_id].model_init_postparse - (); + surf_workstation_model_description[workstation_id].model_init_preparse(); }