#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 "simix/context.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)");
xbt_cfg_help(_surf_cfg_set);
printf(
"\n"
+"Each of these configurations can be used by adding\n"
+" --cfg=<option name>:<option value>\n"
+"to the command line.\n"
"You can also use --help-models to see the details of all models known by this simulator.\n"
#ifdef HAVE_TRACING
"\n"
surf_optimization_mode_description[k].description);
printf("Both network and CPU models have 'Lazy' as default optimization level\n\n");
shall_exit = 1;
- } else if (!strcmp(argv[i], "--help-logs")) {
- xbt_log_help();
- shall_exit = 1;
- } else if (!strcmp(argv[i], "--help-log-categories")) {
- xbt_log_help_categories();
- shall_exit = 1;
#ifdef HAVE_TRACING
} else if (!strcmp(argv[i], "--help-tracing")) {
TRACE_help (1);
_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();
}
-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);
}
/* 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;
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;
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;
//Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN"
- // or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
+ //
or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
xbt_cfg_register(&_surf_cfg_set, "smpi/bw_factor",
"Bandwidth factors for smpi.",
xbt_cfgelm_string, NULL, 1, 1, NULL,
surf_config_cmd_line(argc, argv);
+
+ _surf_init_status = 1;
} else {
XBT_WARN("Call to surf_config_init() after initialization ignored");
}
*/
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"))
+ !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";
+ 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";
}
XBT_DEBUG("Workstation model: %s", workstation_model_name);
