X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07e586be4bf6cd4490fc7bb466d5b7bdaef8c20a..c24da98fc757fe34eb3fdb29b01c80d77313a80a:/src/surf/surf_config.c diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index 8a9fd60af8..6108c02fc9 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -6,12 +6,14 @@ /* surf_config: configuration infrastructure for the simulation world */ +#include "xbt/misc.h" #include "xbt/config.h" #include "xbt/log.h" #include "xbt/str.h" #include "surf/surf_private.h" #include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */ #include "simgrid/simix.h" +#include "mc/mc.h" /* configuration callbacks of model-checking */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of surf (and the rest of the simulation)"); @@ -231,6 +233,9 @@ static void _surf_cfg_cb_model_check(const char *name, int pos) _surf_do_model_check = xbt_cfg_get_int(_surf_cfg_set, name); if (_surf_do_model_check) { +#ifndef HAVE_MC + xbt_die("You tried to activate the model-checking from the command line, but it was not compiled in. Change your settings in cmake, recompile and try again"); +#endif /* Tell modules using mallocators that they shouldn't. MC don't like them */ xbt_fifo_preinit(); xbt_dict_preinit(); @@ -245,8 +250,7 @@ static void _surf_cfg_cb_verbose_exit(const char *name, int pos) } -static void _surf_cfg_cb_context_factory(const char *name, int pos) -{ +static void _surf_cfg_cb_context_factory(const char *name, int pos) { smx_context_factory_name = xbt_cfg_get_string(_surf_cfg_set, name); } @@ -334,8 +338,6 @@ 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; - sprintf(description, "The model to use for the CPU. Possible values: "); p = description; @@ -376,6 +378,23 @@ void surf_config_init(int *argc, char **argv) &default_value, 1, 1, &_surf_cfg_cb__storage_mode, NULL); + /* ********************************************************************* */ + /* TUTORIAL: New model */ + sprintf(description, + "The model to use for the New model. Possible values: "); + p = description; + while (*(++p) != '\0'); + for (i = 0; surf_new_model_description[i].name; i++) + p += sprintf(p, "%s%s", (i == 0 ? "" : ", "), + surf_new_model_description[i].name); + sprintf(p, + ".\n (use 'help' as a value to see the long description of each model)"); + default_value = xbt_strdup("default"); + xbt_cfg_register(&_surf_cfg_set, "new_model/model", description, xbt_cfgelm_string, + &default_value, 1, 1, &_surf_cfg_cb__storage_mode, + NULL); + /* ********************************************************************* */ + sprintf(description, "The model to use for the network. Possible values: "); p = description; @@ -471,18 +490,36 @@ void surf_config_init(int *argc, char **argv) xbt_cfgelm_int, &default_value_int, 0, 1, NULL, NULL); - /* do model-check */ +#ifdef HAVE_MC + /* do model-checking */ default_value_int = 0; xbt_cfg_register(&_surf_cfg_set, "model-check", - "Activate the model-checking of the \"simulated\" system (EXPERIMENTAL -- msg only for now)", + "Verify the system through model-checking instead of simulating it (EXPERIMENTAL)", xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb_model_check, NULL); + + /* do stateful model-checking */ + default_value_int = 0; + xbt_cfg_register(&_surf_cfg_set, "model-check/checkpoint", + "Specify the amount of steps between checkpoints during stateful model-checking (default: 0 => stateless verification). " + "If value=1, one checkpoint is saved for each step => faster verification, but huge memory consumption; higher values are good compromises between speed and memory consumption.", + xbt_cfgelm_int, &default_value_int, 0, 1, + _mc_cfg_cb_checkpoint, 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 default value 0) - xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */ + /* do liveness model-checking */ + default_value = xbt_strdup(""); + xbt_cfg_register(&_surf_cfg_set, "model-check/property", + "Specify the name of the file containing the property. It must be the result of the ltl2ba program.", + xbt_cfgelm_string, &default_value, 0, 1, + _mc_cfg_cb_property, NULL); + + /* Specify the kind of model-checking reduction */ + default_value = xbt_strdup("unset"); + xbt_cfg_register(&_surf_cfg_set, "model-check/reduction", + "Specify the kind of exploration reduction (either none or DPOR)", + xbt_cfgelm_string, &default_value, 0, 1, + _mc_cfg_cb_reduce, NULL); +#endif /* do verbose-exit */ default_value_int = 1; @@ -591,6 +628,12 @@ void surf_config_init(int *argc, char **argv) xbt_cfgelm_double, &default_threshold, 1, 1, NULL, NULL); + int default_small_messages_threshold = 0; + xbt_cfg_register(&_surf_cfg_set, "smpi/async_small_thres", + "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver", + xbt_cfgelm_int, &default_small_messages_threshold, 1, 1, NULL, + NULL); + //For smpi/bw_factor and smpi/lat_factor //Default value have to be "threshold0:value0;threshold1:value1;...;thresholdN:valueN" //test is if( size >= thresholdN ) return valueN; @@ -622,6 +665,8 @@ void surf_config_init(int *argc, char **argv) surf_config_cmd_line(argc, argv); + + _surf_init_status = 1; } else { XBT_WARN("Call to surf_config_init() after initialization ignored"); } @@ -698,4 +743,14 @@ void surf_config_models_setup() XBT_DEBUG("Call storage_model_init"); storage_id = find_model_description(surf_storage_model_description, storage_model_name); surf_storage_model_description[storage_id].model_init_preparse(); + + /* ********************************************************************* */ + /* TUTORIAL: New model */ + int new_model_id = -1; + char *new_model_name = NULL; + new_model_name = xbt_cfg_get_string(_surf_cfg_set, "new_model/model"); + XBT_DEBUG("Call new model_init"); + new_model_id = find_model_description(surf_new_model_description, new_model_name); + surf_new_model_description[new_model_id].model_init_preparse(); + /* ********************************************************************* */ }