X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..2aa97ab052f0a1c3ae440a621a6a38c041ebe375:/src/surf/surf_config.c diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index 04c3f5268a..f269695277 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -9,13 +9,14 @@ #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, "About the configuration of surf (and the rest of the simulation)"); xbt_cfg_t _surf_cfg_set = NULL; - /* Parse the command line, looking for options */ static void surf_config_cmd_line(int *argc, char **argv) { @@ -29,7 +30,7 @@ static void surf_config_cmd_line(int *argc, char **argv) opt++; xbt_cfg_set_parse(_surf_cfg_set, opt); - DEBUG1("Did apply '%s' as config setting", opt); + XBT_DEBUG("Did apply '%s' as config setting", opt); remove_it = 1; } else if (!strncmp(argv[i], "--cfg-help", strlen("--cfg-help") + 1) || !strncmp(argv[i], "--help", strlen("--help") + 1)) { @@ -38,6 +39,10 @@ static void surf_config_cmd_line(int *argc, char **argv) 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"); +#ifdef HAVE_TRACING + 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 @@ -46,6 +51,13 @@ static void surf_config_cmd_line(int *argc, char **argv) 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)) { + TRACE_help (1); + exit(0); +#endif } if (remove_it) { /*remove this from argv */ for (j = i + 1; j < *argc; j++) { @@ -69,7 +81,7 @@ static void _surf_cfg_cb__workstation_model(const char *name, int pos) { char *val; - xbt_assert0(_surf_init_status < 2, + xbt_assert(_surf_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); @@ -88,7 +100,7 @@ static void _surf_cfg_cb__cpu_model(const char *name, int pos) { char *val; - xbt_assert0(_surf_init_status < 2, + xbt_assert(_surf_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); @@ -107,7 +119,7 @@ static void _surf_cfg_cb__network_model(const char *name, int pos) { char *val; - xbt_assert0(_surf_init_status < 2, + xbt_assert(_surf_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); @@ -128,6 +140,16 @@ static void _surf_cfg_cb__tcp_gamma(const char *name, int pos) sg_tcp_gamma = xbt_cfg_get_double(_surf_cfg_set, name); } +static void _surf_cfg_cb__maxmin_precision(const char* name, int pos) +{ + sg_maxmin_precision = xbt_cfg_get_double(_surf_cfg_set, name); +} + +static void _surf_cfg_cb__sender_gap(const char* name, int pos) +{ + sg_sender_gap = xbt_cfg_get_double(_surf_cfg_set, name); +} + static void _surf_cfg_cb__latency_factor(const char *name, int pos) { sg_latency_factor = xbt_cfg_get_double(_surf_cfg_set, name); @@ -158,21 +180,62 @@ 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 */ +extern int _surf_do_model_check; /* this variable lives in xbt_main until I find a right location for it */ 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(); + } +} + +extern int _surf_do_verbose_exit; + +static void _surf_cfg_cb_verbose_exit(const char *name, int pos) +{ + _surf_do_verbose_exit = xbt_cfg_get_int(_surf_cfg_set, name); +} + + +static void _surf_cfg_cb_context_factory(const char *name, int pos) +{ + smx_context_factory_name = xbt_cfg_get_string(_surf_cfg_set, name); +} + +static void _surf_cfg_cb_context_stack_size(const char *name, int pos) +{ + smx_context_stack_size = xbt_cfg_get_int(_surf_cfg_set, name) * 1024; } -int _surf_parallel_contexts = 0; +static void _surf_cfg_cb_contexts_nthreads(const char *name, int pos) +{ + SIMIX_context_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name)); +} -static void _surf_cfg_cb_parallel_contexts(const char *name, int pos) +static void _surf_cfg_cb_contexts_parallel_threshold(const char *name, int pos) { - _surf_parallel_contexts = 1; + 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, @@ -261,9 +324,21 @@ void surf_config_init(int *argc, char **argv) "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)", xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__tcp_gamma, NULL); - xbt_cfg_set_double(_surf_cfg_set, "TCP_gamma", 20000.0); + xbt_cfg_setdefault_double(_surf_cfg_set, "TCP_gamma", 20000.0); + + xbt_cfg_register(&_surf_cfg_set, "maxmin/precision", + "Minimum retained action value when updating simulation", + xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__maxmin_precision, NULL); + xbt_cfg_setdefault_double(_surf_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here! /* The parameters of network models */ + + double_default_value = 0.0; + xbt_cfg_register(&_surf_cfg_set, "network/sender_gap", + "Minimum gap between two overlapping sends", + xbt_cfgelm_double, &double_default_value, 1, 1, + _surf_cfg_cb__sender_gap, NULL); + double_default_value = 1.0; xbt_cfg_register(&_surf_cfg_set, "network/latency_factor", "Correction factor to apply to the provided latency (default value set by network model)", @@ -298,32 +373,68 @@ 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); + /* 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) + _surf_cfg_cb_model_check which sets it's value to 1 (instead of the default value 0) xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */ - /* parallel contexts */ + /* do verbose-exit */ default_value_int = 0; - xbt_cfg_register(&_surf_cfg_set, "parallel-contexts", - "Activate the parallel execution of user contexts (EXPERIMENTAL -- pthreads only)", + xbt_cfg_register(&_surf_cfg_set, "verbose-exit", + "Activate the \"do nothing\" mode in Ctrl-C", xbt_cfgelm_int, &default_value_int, 0, 1, - _surf_cfg_cb_parallel_contexts, NULL); + _surf_cfg_cb_verbose_exit, NULL); + + + /* context factory */ + default_value = xbt_strdup("ucontext"); + xbt_cfg_register(&_surf_cfg_set, "contexts/factory", + "Context factory to use in SIMIX (ucontext, thread or raw)", + xbt_cfgelm_string, &default_value, 1, 1, _surf_cfg_cb_context_factory, NULL); + + /* stack size of contexts in Ko */ + default_value_int = 128; + xbt_cfg_register(&_surf_cfg_set, "contexts/stack_size", + "Stack size of contexts in Ko (ucontext or raw only)", + xbt_cfgelm_int, &default_value_int, 1, 1, + _surf_cfg_cb_context_stack_size, NULL); + + /* number of parallel threads for user processes */ + default_value_int = 1; + xbt_cfg_register(&_surf_cfg_set, "contexts/nthreads", + "Number of parallel threads for user contexts (EXPERIMENTAL)", + xbt_cfgelm_int, &default_value_int, 1, 1, + _surf_cfg_cb_contexts_nthreads, NULL); + + /* 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", + 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", - "Update the constraint set propagating recursively to others constraints", + "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_set_int(_surf_cfg_set, "fullduplex", default_value_int); + xbt_cfg_setdefault_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, NULL, 1, 1, _surf_cfg_cb__gtnets_jitter, NULL); - xbt_cfg_set_double(_surf_cfg_set, "gtnets_jitter", 0.0); + xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets_jitter", 0.0); default_value_int = 10; xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter_seed", @@ -331,21 +442,27 @@ 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(); - xbt_assert0((initial_path), + xbt_assert((initial_path), "__surf_get_initial_path() failed! Can't resolves current Windows directory"); surf_path = xbt_dynar_new(sizeof(char *), NULL); - xbt_cfg_set_string(_surf_cfg_set, "path", initial_path); + xbt_cfg_setdefault_string(_surf_cfg_set, "path", initial_path); } surf_config_cmd_line(argc, argv); } else { - WARN0("Call to surf_config_init() after initialization ignored"); + XBT_WARN("Call to surf_config_init() after initialization ignored"); } } @@ -374,17 +491,19 @@ void surf_config_models_setup(const char *platform_file) * 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"; - INFO0 - ("Switching workstation model to compound since you changed the network and/or cpu model(s)"); - xbt_cfg_set_string(_surf_cfg_set, "workstation/model", val); - workstation_model_name = (char *) "compound"; + + if((!xbt_cfg_is_default_value(_surf_cfg_set, "network/model") || + !xbt_cfg_is_default_value(_surf_cfg_set, "cpu/model")) && + xbt_cfg_is_default_value(_surf_cfg_set, "workstation/model")) + { + const char *val = "compound"; + XBT_INFO + ("Switching workstation model to compound since you changed the network and/or cpu model(s)"); + xbt_cfg_set_string(_surf_cfg_set, "workstation/model", val); + workstation_model_name = (char *) "compound"; } - DEBUG1("Workstation model: %s", workstation_model_name); + XBT_DEBUG("Workstation model: %s", workstation_model_name); workstation_id = find_model_description(surf_workstation_model_description, workstation_model_name); @@ -392,10 +511,10 @@ void surf_config_models_setup(const char *platform_file) int network_id = -1; int cpu_id = -1; - xbt_assert0(cpu_model_name, + xbt_assert(cpu_model_name, "Set a cpu model to use with the 'compound' workstation model"); - xbt_assert0(network_model_name, + xbt_assert(network_model_name, "Set a network model to use with the 'compound' workstation model"); network_id = @@ -409,7 +528,7 @@ void surf_config_models_setup(const char *platform_file) (platform_file); } - DEBUG0("Call workstation_model_init"); + XBT_DEBUG("Call workstation_model_init"); surf_workstation_model_description[workstation_id].model_init_preparse (platform_file); }