X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa4060ec66733095cfd2cf3b7cb3f75de9c1a34d..95593758ba86cb7c19a171174bcb1a46848e5caf:/src/simgrid/sg_config.c?ds=sidebyside
diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index 6deb481af3..fd2dfd2aa8 100644
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -67,6 +67,7 @@ static void sg_config_cmd_line(int *argc, char **argv)
"Each of these configurations can be used by adding\n"
" --cfg=: \n"
"to the command line.\n"
+"\n"
"You can also use --help-models to see the details of all models known by this simulator.\n"
#ifdef HAVE_TRACING
"\n"
@@ -387,6 +388,12 @@ static void _sg_cfg_cb_context_stack_size(const char *name, int pos)
smx_context_stack_size = xbt_cfg_get_int(_sg_cfg_set, name) * 1024;
}
+static void _sg_cfg_cb_context_guard_size(const char *name, int pos)
+{
+ smx_context_guard_size_was_set = 1;
+ smx_context_guard_size = xbt_cfg_get_int(_sg_cfg_set, name) * xbt_pagesize;
+}
+
static void _sg_cfg_cb_contexts_nthreads(const char *name, int pos)
{
SIMIX_context_set_nthreads(xbt_cfg_get_int(_sg_cfg_set, name));
@@ -476,7 +483,7 @@ void sg_config_init(int *argc, char **argv)
describe_model(description, surf_plugin_description,
"plugin", "The plugins");
xbt_cfg_register(&_sg_cfg_set, "plugin", description,
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__plugin, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__plugin, NULL);
describe_model(description, surf_cpu_model_description,
"model", "The model to use for the CPU");
@@ -537,7 +544,8 @@ void sg_config_init(int *argc, char **argv)
xbt_cfg_register(&_sg_cfg_set, "network/sender_gap",
"Minimum gap between two overlapping sends",
xbt_cfgelm_double, 1, 1, _sg_cfg_cb__sender_gap, NULL);
- /* default for "network/sender_gap" is set in network.c */
+ /* real default for "network/sender_gap" is set in network_smpi.cpp */
+ xbt_cfg_setdefault_double(_sg_cfg_set, "network/sender_gap", NAN);
xbt_cfg_register(&_sg_cfg_set, "network/latency_factor",
"Correction factor to apply to the provided latency (default value set by network model)",
@@ -552,78 +560,79 @@ void sg_config_init(int *argc, char **argv)
xbt_cfg_register(&_sg_cfg_set, "network/weight_S",
"Correction factor to apply to the weight of competing streams (default value set by network model)",
xbt_cfgelm_double, 1, 1, _sg_cfg_cb__weight_S, NULL);
- /* default for "network/weight_S" is set in network.c */
+ /* real default for "network/weight_S" is set in network_*.cpp */
+ xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", NAN);
/* Inclusion path */
xbt_cfg_register(&_sg_cfg_set, "path",
"Lookup path for inclusions in platform and deployment XML files",
- xbt_cfgelm_string, 0, 0, _sg_cfg_cb__surf_path, NULL);
+ xbt_cfgelm_string, 1, 0, _sg_cfg_cb__surf_path, NULL);
xbt_cfg_register(&_sg_cfg_set, "cpu/maxmin_selective_update",
"Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)",
- xbt_cfgelm_boolean, 0, 1, NULL, NULL);
+ xbt_cfgelm_boolean, 1, 1, NULL, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "cpu/maxmin_selective_update", "no");
xbt_cfg_register(&_sg_cfg_set, "network/maxmin_selective_update",
"Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)",
- xbt_cfgelm_boolean, 0, 1, NULL, NULL);
+ xbt_cfgelm_boolean, 1, 1, NULL, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/maxmin_selective_update", "no");
#ifdef HAVE_MC
/* do model-checking */
xbt_cfg_register(&_sg_cfg_set, "model-check",
"Verify the system through model-checking instead of simulating it (EXPERIMENTAL)",
- xbt_cfgelm_boolean, 0, 1, _sg_cfg_cb_model_check, NULL);
+ xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_model_check, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check", "no");
/* do stateful model-checking */
xbt_cfg_register(&_sg_cfg_set, "model-check/checkpoint",
"Specify the amount of steps between checkpoints during stateful model-checking (default: 0 => stateless verification). "
- "If value=on, 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, 0, 1, _mc_cfg_cb_checkpoint, NULL);
+ "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, 1, 1, _mc_cfg_cb_checkpoint, NULL);
xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/checkpoint", 0);
/* do liveness model-checking */
xbt_cfg_register(&_sg_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, 0, 1, _mc_cfg_cb_property, NULL);
+ xbt_cfgelm_string, 1, 1, _mc_cfg_cb_property, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/property", "");
/* Specify the kind of model-checking reduction */
xbt_cfg_register(&_sg_cfg_set, "model-check/reduction",
"Specify the kind of exploration reduction (either none or DPOR)",
- xbt_cfgelm_string, 0, 1, _mc_cfg_cb_reduce, NULL);
+ xbt_cfgelm_string, 1, 1, _mc_cfg_cb_reduce, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/reduction", "dpor");
/* Enable/disable timeout for wait requests with model-checking */
xbt_cfg_register(&_sg_cfg_set, "model-check/timeout",
"Enable/Disable timeout for wait requests",
- xbt_cfgelm_boolean, 0, 1, _mc_cfg_cb_timeout, NULL);
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_timeout, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/timeout", "no");
/* Set max depth exploration */
xbt_cfg_register(&_sg_cfg_set, "model-check/max_depth",
"Specify the max depth of exploration (default : 1000)",
- xbt_cfgelm_int, 0, 1, _mc_cfg_cb_max_depth, NULL);
+ xbt_cfgelm_int, 1, 1, _mc_cfg_cb_max_depth, NULL);
xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/max_depth", 1000);
/* Set number of visited state stored for state comparison reduction*/
xbt_cfg_register(&_sg_cfg_set, "model-check/visited",
"Specify the number of visited state stored for state comparison reduction. If value=5, the last 5 visited states are stored",
- xbt_cfgelm_int, 0, 1, _mc_cfg_cb_visited, NULL);
+ xbt_cfgelm_int, 1, 1, _mc_cfg_cb_visited, NULL);
xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/visited", 0);
/* Set file name for dot output of graph state */
xbt_cfg_register(&_sg_cfg_set, "model-check/dot_output",
"Specify the name of dot file corresponding to graph state",
- xbt_cfgelm_string, 0, 1, _mc_cfg_cb_dot_output, NULL);
+ xbt_cfgelm_string, 1, 1, _mc_cfg_cb_dot_output, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/dot_output", "");
#endif
/* do verbose-exit */
xbt_cfg_register(&_sg_cfg_set, "verbose-exit",
"Activate the \"do nothing\" mode in Ctrl-C",
- xbt_cfgelm_boolean, 0, 1, _sg_cfg_cb_verbose_exit, NULL);
+ xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_verbose_exit, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "verbose-exit", "yes");
/* context factory */
@@ -647,14 +656,22 @@ void sg_config_init(int *argc, char **argv)
xbt_cfgelm_string, 1, 1, _sg_cfg_cb_context_factory, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/factory", dflt_ctx_fact);
- /* stack size of contexts in Ko */
+ /* stack size of contexts in KiB */
xbt_cfg_register(&_sg_cfg_set, "contexts/stack_size",
- "Stack size of contexts in Kib",
+ "Stack size of contexts in KiB",
xbt_cfgelm_int, 1, 1, _sg_cfg_cb_context_stack_size, NULL);
- xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/stack_size", 128);
+ xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/stack_size", 8*1024);
/* No, it was not set yet (the above setdefault() changed this to 1). */
smx_context_stack_size_was_set = 0;
+ /* guard size for contexts stacks in memory pages */
+ xbt_cfg_register(&_sg_cfg_set, "contexts/guard_size",
+ "Guard size for contexts stacks in memory pages",
+ xbt_cfgelm_int, 1, 1, _sg_cfg_cb_context_guard_size, NULL);
+ xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/guard_size", 1);
+ /* No, it was not set yet (the above setdefault() changed this to 1). */
+ smx_context_guard_size_was_set = 0;
+
/* number of parallel threads for user processes */
xbt_cfg_register(&_sg_cfg_set, "contexts/nthreads",
"Number of parallel threads used to execute user contexts",
@@ -684,7 +701,7 @@ void sg_config_init(int *argc, char **argv)
xbt_cfg_register(&_sg_cfg_set, "network/crosstraffic",
"Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)",
- xbt_cfgelm_boolean, 0, 1, _sg_cfg_cb__surf_network_crosstraffic, NULL);
+ xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb__surf_network_crosstraffic, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "no");
#ifdef HAVE_GTNETS
@@ -776,47 +793,47 @@ void sg_config_init(int *argc, char **argv)
xbt_cfg_register(&_sg_cfg_set, "smpi/gather",
"Which collective to use for gather",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_gather, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_gather, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/allgather",
"Which collective to use for allgather",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_allgather, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_allgather, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/barrier",
"Which collective to use for barrier",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_barrier, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_barrier, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/reduce_scatter",
"Which collective to use for reduce_scatter",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_reduce_scatter, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_reduce_scatter, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/scatter",
"Which collective to use for scatter",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_scatter, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_scatter, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/allgatherv",
"Which collective to use for allgatherv",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_allgatherv, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_allgatherv, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/allreduce",
"Which collective to use for allreduce",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_allreduce, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_allreduce, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/alltoall",
"Which collective to use for alltoall",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_alltoall, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_alltoall, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/alltoallv",
"Which collective to use for alltoallv",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_alltoallv, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_alltoallv, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/bcast",
"Which collective to use for bcast",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_bcast, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_bcast, NULL);
xbt_cfg_register(&_sg_cfg_set, "smpi/reduce",
"Which collective to use for reduce",
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__coll_reduce, NULL);
+ xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_reduce, NULL);
#endif // HAVE_SMPI
xbt_cfg_register(&_sg_cfg_set, "clean_atexit",
@@ -834,6 +851,7 @@ void sg_config_init(int *argc, char **argv)
xbt_cfg_setdefault_string(_sg_cfg_set, "path", initial_path);
}
+ xbt_cfg_check(_sg_cfg_set);
_sg_cfg_init_status = 1;
sg_config_cmd_line(argc, argv);