X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d32796efe1be63d7a67b8718527fa03a32c4baa..247d96de592ac1fcd59411032c6528f238764516:/src/surf/surf_config.c diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index 4d286c2f6e..293a32ae62 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -6,6 +6,7 @@ /* surf_config: configuration infrastructure for the simulation world */ +#include "xbt/misc.h" #include "xbt/config.h" #include "xbt/log.h" #include "xbt/str.h" @@ -85,16 +86,17 @@ static void surf_config_cmd_line(int *argc, char **argv) } -int _surf_init_status = 0; /* 0: beginning of time; - 1: pre-inited (cfg_set created); - 2: inited (running) */ +int _surf_init_status = 0; /* 0: beginning of time (config cannot be changed yet); + 1: initialized: cfg_set created (config can now be changed); + 2: configured: command line parsed and config part of platform file was integrated also, platform construction ongoing or done. + (Config cannot be changed anymore!) */ /* callback of the workstation/model variable */ static void _surf_cfg_cb__workstation_model(const char *name, int pos) { char *val; - xbt_assert(_surf_init_status < 2, + xbt_assert(_surf_init_status == 1, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); @@ -113,7 +115,7 @@ static void _surf_cfg_cb__cpu_model(const char *name, int pos) { char *val; - xbt_assert(_surf_init_status < 2, + xbt_assert(_surf_init_status == 1, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); @@ -132,7 +134,7 @@ static void _surf_cfg_cb__optimization_mode(const char *name, int pos) { char *val; - xbt_assert(_surf_init_status < 2, + xbt_assert(_surf_init_status == 1, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); @@ -151,7 +153,7 @@ static void _surf_cfg_cb__storage_mode(const char *name, int pos) { char *val; - xbt_assert(_surf_init_status < 2, + xbt_assert(_surf_init_status == 1, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); @@ -170,7 +172,7 @@ static void _surf_cfg_cb__network_model(const char *name, int pos) { char *val; - xbt_assert(_surf_init_status < 2, + xbt_assert(_surf_init_status == 1, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); @@ -231,14 +233,11 @@ 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 + if (_surf_do_model_check) { 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(); } +#endif } extern int _surf_do_verbose_exit; @@ -377,6 +376,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; @@ -501,6 +517,27 @@ void surf_config_init(int *argc, char **argv) "Specify the kind of exploration reduction (either none or DPOR)", xbt_cfgelm_string, &default_value, 0, 1, _mc_cfg_cb_reduce, NULL); + + /* Enable/disable timeout for wait requests with model-checking */ + default_value_int = 1; + xbt_cfg_register(&_surf_cfg_set, "model-check/timeout", + "Enable/Disable timeout for wait requests", + xbt_cfgelm_int, &default_value, 0, 1, + _mc_cfg_cb_timeout, NULL); + + /* Set max depth exploration */ + default_value_int = 1000; + xbt_cfg_register(&_surf_cfg_set, "model-check/max_depth", + "Specify the max depth of exploration (default : 1000)", + xbt_cfgelm_int, &default_value, 0, 1, + _mc_cfg_cb_max_depth, NULL); + + /* Set number of visited state stored in stateful mode */ + default_value_int = 0; + xbt_cfg_register(&_surf_cfg_set, "model-check/stateful", + "Specify the number of visited state stored in stateful mode. If value=5, the last 5 visited states are stored", + xbt_cfgelm_int, &default_value, 0, 1, + _mc_cfg_cb_stateful, NULL); #endif /* do verbose-exit */ @@ -645,10 +682,10 @@ void surf_config_init(int *argc, char **argv) xbt_cfg_setdefault_string(_surf_cfg_set, "path", initial_path); } + _surf_init_status = 1; surf_config_cmd_line(argc, argv); - _surf_init_status = 1; } else { XBT_WARN("Call to surf_config_init() after initialization ignored"); } @@ -725,4 +762,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(); + /* ********************************************************************* */ }