/* surf_config: configuration infrastructure for the simulation world */
+#include "xbt/misc.h"
#include "xbt/config.h"
#include "xbt/log.h"
#include "xbt/str.h"
}
-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);
{
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);
{
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);
{
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);
{
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);
{
_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;
/* 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;
&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;
xbt_cfgelm_int, &default_value_int, 0, 1,
NULL, NULL);
-#if HAVE_MC
+#ifdef HAVE_MC
/* do model-checking */
default_value_int = 0;
xbt_cfg_register(&_surf_cfg_set, "model-check",
"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 */
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;
xbt_cfg_setdefault_string(_surf_cfg_set, "path", initial_path);
}
+ _surf_init_status = 1;
surf_config_cmd_line(argc, argv);
+
} else {
XBT_WARN("Call to surf_config_init() after initialization ignored");
}
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();
+ /* ********************************************************************* */
}
