/* surf_config: configuration infrastructure for the simulation world */
#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 "simix/context.h"
+#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
+#include "simgrid/simix.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;
-static void LOG_help(void)
-{
- printf("Description of the logging output:\n");
- printf("\tIn your command line use option: --log=CATEGORY_NAME.thres:PRIORITY_LEVEL\n");
- printf("\t\tCATEGORY_NAME: defined in code with function 'XBT_LOG_NEW_CATEGORY'\n");
- printf("\t\tPRIORITY_LEVEL: the level to print (trace,debug,verbose,info,warning,error,critical)\n");
- printf("\n");
-}
-
/* Parse the command line, looking for options */
static void surf_config_cmd_line(int *argc, char **argv)
{
+ int shall_exit = 0;
int i, j;
char *opt;
- for (i = 1; i < *argc; i++) {
- int remove_it = 0;
+ for (j = i = 1; i < *argc; i++) {
if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
opt = strchr(argv[i], '=');
opt++;
xbt_cfg_set_parse(_surf_cfg_set, 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)) {
+ } else if (!strcmp(argv[i], "--cfg-help") || !strcmp(argv[i], "--help")) {
printf
("Description of the configuration accepted by this simulator:\n");
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");
+ 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
- printf("\nYou can also use --help-tracing to see the details of all tracing options known by this simulator.\n");
+"\n"
+"You can also use --help-tracing to see the details of all tracing options known by this simulator.\n"
#endif
- printf("\nYou can also use --help-logs to see the details of logging output.\n\n");
- exit(0);
- } else if (!strncmp(argv[i], "--help-models", strlen("--help-models") + 1)) {
+"\n"
+"You can also use --help-logs and --help-log-categories to see the details of logging output.\n"
+"\n"
+ );
+ shall_exit = 1;
+ } else if (!strcmp(argv[i], "--help-models")) {
+ int k;
+
model_help("workstation", surf_workstation_model_description);
printf("\n");
model_help("CPU", surf_cpu_model_description);
printf("\n");
model_help("network", surf_network_model_description);
printf("\nLong description of all optimization levels accepted by the models of this simulator:\n");
- for (i = 0; surf_optimization_mode_description[i].name; i++)
- printf(" %s: %s\n", surf_optimization_mode_description[i].name, surf_optimization_mode_description[i].description);
- printf("Both network and CPU models have 'Lazy' as default optimization level\n");
- exit(0);
- } else if (!strncmp(argv[i], "--help-logs", strlen("--help-logs") + 1)) {
- LOG_help ();
- exit(0);
+ for (k = 0; surf_optimization_mode_description[k].name; k++)
+ printf(" %s: %s\n",
+ surf_optimization_mode_description[k].name,
+ surf_optimization_mode_description[k].description);
+ printf("Both network and CPU models have 'Lazy' as default optimization level\n\n");
+ shall_exit = 1;
#ifdef HAVE_TRACING
- } else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {
+ } else if (!strcmp(argv[i], "--help-tracing")) {
TRACE_help (1);
- exit(0);
+ shall_exit = 1;
#endif
+ } else {
+ argv[j++] = argv[i];
}
- if (remove_it) { /*remove this from argv */
- for (j = i + 1; j < *argc; j++) {
- argv[j - 1] = argv[j];
- }
-
- argv[j - 1] = NULL;
- (*argc)--;
- i--; /* compensate effect of next loop incrementation */
- }
}
+ if (j < *argc) {
+ argv[j] = NULL;
+ *argc = j;
+ }
+ if (shall_exit)
+ exit(0);
}
}
}
+extern int _surf_do_mc_checkpoint;
+
+static void _surf_cfg_cb_mc_checkpoint(const char *name, int pos)
+{
+ _surf_do_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name);
+}
+
extern int _surf_do_verbose_exit;
static void _surf_cfg_cb_verbose_exit(const char *name, int pos)
_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 stateful model-check */
+ default_value_int = 0;
+ xbt_cfg_register(&_surf_cfg_set, "mc-checkpoint",
+ "Activate the stateful model-checking of the \"simulated\" system (EXPERIMENTAL -- msg only for now), value corresponding to steps between each checkpoint",
+ xbt_cfgelm_int, &default_value_int, 0, 1,
+ _surf_cfg_cb_model_check, NULL);
+
+
/* do verbose-exit */
default_value_int = 1;
xbt_cfg_register(&_surf_cfg_set, "verbose-exit",
//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,
*/
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);
