X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea2c8ccd0b9ec582382f5f546d4a7faf5e6ce0e4..5d6e2b005da294874b8cf58e7766c9d8138b7aaf:/src/surf/surf_config.c
diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 0954084a99..28f00ec597 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -7,10 +7,11 @@
/* 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)");
@@ -20,55 +21,66 @@ xbt_cfg_t _surf_cfg_set = NULL;
/* 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=: \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
- 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);
+ 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);
}
@@ -133,6 +145,25 @@ static void _surf_cfg_cb__optimization_mode(const char *name, int pos)
find_model_description(surf_optimization_mode_description, val);
}
+/* callback of the cpu/model variable */
+static void _surf_cfg_cb__storage_mode(const char *name, int pos)
+{
+ char *val;
+
+ xbt_assert(_surf_init_status < 2,
+ "Cannot change the model after the initialization");
+
+ val = xbt_cfg_get_string(_surf_cfg_set, name);
+
+ if (!strcmp(val, "help")) {
+ model_help("storage", surf_storage_model_description);
+ exit(0);
+ }
+
+ /* New Module missing */
+ find_model_description(surf_storage_model_description, val);
+}
+
/* callback of the workstation_model variable */
static void _surf_cfg_cb__network_model(const char *name, int pos)
{
@@ -206,6 +237,14 @@ static void _surf_cfg_cb_model_check(const char *name, int pos)
}
}
+extern int _surf_do_mc_checkpoint; /* this variable lives in xbt_main until I find a right location for it */
+
+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)
@@ -247,7 +286,7 @@ static void _surf_cfg_cb_contexts_parallel_mode(const char *name, int pos)
SIMIX_context_set_parallel_mode(XBT_PARMAP_BUSY_WAIT);
}
else {
- XBT_WARN("Command line setting of the parallel synchronization mode should "
+ xbt_die("Command line setting of the parallel synchronization mode should "
"be one of \"posix\", \"futex\" or \"busy_wait\"");
}
}
@@ -331,6 +370,20 @@ void surf_config_init(int *argc, char **argv)
xbt_cfg_register(&_surf_cfg_set, "cpu/optim", description, xbt_cfgelm_string,
&default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL);
+ sprintf(description,
+ "The model to use for the storage. Possible values: ");
+ p = description;
+ while (*(++p) != '\0');
+ for (i = 0; surf_storage_model_description[i].name; i++)
+ p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+ surf_storage_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, "storage/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;
@@ -439,6 +492,14 @@ void surf_config_init(int *argc, char **argv)
_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_mc_checkpoint, NULL);
+
/* do verbose-exit */
default_value_int = 1;
xbt_cfg_register(&_surf_cfg_set, "verbose-exit",
@@ -486,7 +547,7 @@ void surf_config_init(int *argc, char **argv)
_surf_cfg_cb_contexts_parallel_mode, NULL);
/* number of parallel threads for Surf */
- default_value_int = 1;
+ default_value_int = surf_get_nthreads();
xbt_cfg_register(&_surf_cfg_set, "surf/nthreads",
"Number of parallel threads used to update Surf models",
xbt_cfgelm_int, &default_value_int, 1, 1,
@@ -511,7 +572,7 @@ void surf_config_init(int *argc, char **argv)
"Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)",
xbt_cfgelm_double, NULL, 1, 1,
_surf_cfg_cb__gtnets_jitter, NULL);
- xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets_jitter", 0.0);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets/jitter", 0.0);
default_value_int = 10;
xbt_cfg_register(&_surf_cfg_set, "gtnets/jitter_seed",
@@ -550,7 +611,7 @@ void surf_config_init(int *argc, char **argv)
//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