X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25cc8f2c515534fee077ff6ef9a71b55bfc2786f..ffb57ae2c9e165e5820768c62bf4f72a831fc020:/src/simgrid/sg_config.c diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c index 3022b610d4..1e7b8455a2 100644 --- a/src/simgrid/sg_config.c +++ b/src/simgrid/sg_config.c @@ -11,7 +11,7 @@ #include "xbt/log.h" #include "xbt/mallocator.h" #include "xbt/str.h" -#include "xbt/lib.h" +#include "xbt/lib.h" #include "xbt/sysdep.h" #include "surf/surf.h" #include "surf/maxmin.h" @@ -194,7 +194,6 @@ static void _sg_cfg_cb__network_model(const char *name, int pos) find_model_description(surf_network_model_description, val); } - /* callbacks of the network models values */ static void _sg_cfg_cb__tcp_gamma(const char *name, int pos) { @@ -229,8 +228,8 @@ static void _sg_cfg_cb__weight_S(const char *name, int pos) #ifdef HAVE_SMPI /* callback of the mpi collectives */ static void _sg_cfg_cb__coll(const char *category, - s_mpi_coll_description_t * table, - const char *name, int pos) + s_mpi_coll_description_t * table, + const char *name, int pos) { char *val; @@ -262,19 +261,19 @@ static void _sg_cfg_cb__coll_allreduce(const char *name, int pos) } static void _sg_cfg_cb__coll_alltoall(const char *name, int pos) { - _sg_cfg_cb__coll("alltoall", mpi_coll_alltoall_description, name, pos); + _sg_cfg_cb__coll("alltoall", mpi_coll_alltoall_description, name, pos); } static void _sg_cfg_cb__coll_alltoallv(const char *name, int pos) { - _sg_cfg_cb__coll("alltoallv", mpi_coll_alltoallv_description, name, pos); + _sg_cfg_cb__coll("alltoallv", mpi_coll_alltoallv_description, name, pos); } static void _sg_cfg_cb__coll_bcast(const char *name, int pos) { - _sg_cfg_cb__coll("bcast", mpi_coll_bcast_description, name, pos); + _sg_cfg_cb__coll("bcast", mpi_coll_bcast_description, name, pos); } static void _sg_cfg_cb__coll_reduce(const char *name, int pos) { - _sg_cfg_cb__coll("reduce", mpi_coll_reduce_description, name, pos); + _sg_cfg_cb__coll("reduce", mpi_coll_reduce_description, name, pos); } static void _sg_cfg_cb__coll_reduce_scatter(const char *name, int pos){ _sg_cfg_cb__coll("reduce_scatter", mpi_coll_reduce_scatter_description, name, pos); @@ -318,8 +317,15 @@ static void _sg_cfg_cb_verbose_exit(const char *name, int pos) _sg_do_verbose_exit = xbt_cfg_get_boolean(_sg_cfg_set, name); } +extern int _sg_do_clean_atexit; -static void _sg_cfg_cb_context_factory(const char *name, int pos) { +static void _sg_cfg_cb_clean_atexit(const char *name, int pos) +{ + _sg_do_clean_atexit = xbt_cfg_get_boolean(_sg_cfg_set, name); +} + +static void _sg_cfg_cb_context_factory(const char *name, int pos) +{ smx_context_factory_name = xbt_cfg_get_string(_sg_cfg_set, name); } @@ -353,12 +359,12 @@ static void _sg_cfg_cb_contexts_parallel_mode(const char *name, int pos) } else { xbt_die("Command line setting of the parallel synchronization mode should " - "be one of \"posix\", \"futex\" or \"busy_wait\""); + "be one of \"posix\", \"futex\" or \"busy_wait\""); } } static void _sg_cfg_cb__surf_network_coordinates(const char *name, - int pos) + int pos) { int val = xbt_cfg_get_boolean(_sg_cfg_set, name); if (val) { @@ -509,7 +515,7 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register(&_sg_cfg_set, "maxmin/precision", "Numerical precision used when updating simulation models (epsilon in double comparisons)", xbt_cfgelm_double, NULL, 1, 1, _sg_cfg_cb__maxmin_precision, NULL); - xbt_cfg_setdefault_double(_sg_cfg_set, "maxmin/precision", 0.00001); + xbt_cfg_setdefault_double(_sg_cfg_set, "maxmin/precision", 0.00001); /* The parameters of network models */ @@ -540,34 +546,33 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, NULL, 0, 0, _sg_cfg_cb__surf_path, NULL); - default_value = xbt_strdup("off"); 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, &default_value, 0, 1, + xbt_cfgelm_boolean, NULL, 0, 1, NULL, NULL); - default_value = xbt_strdup("off"); + 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, &default_value, 0, 1, + xbt_cfgelm_boolean, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/maxmin_selective_update", "no"); #ifdef HAVE_MC /* do model-checking */ - default_value = xbt_strdup("off"); xbt_cfg_register(&_sg_cfg_set, "model-check", "Verify the system through model-checking instead of simulating it (EXPERIMENTAL)", xbt_cfgelm_boolean, NULL, 0, 1, _sg_cfg_cb_model_check, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check", default_value); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check", "no"); /* do stateful model-checking */ - default_value = xbt_strdup("off"); xbt_cfg_register(&_sg_cfg_set, "model-check/checkpoint", - "Specify the amount of steps between checkpoints during stateful model-checking (default: off => stateless verification). " + "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_boolean, NULL, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, _mc_cfg_cb_checkpoint, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/checkpoint", default_value); + xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/checkpoint", 0); /* do liveness model-checking */ xbt_cfg_register(&_sg_cfg_set, "model-check/property", @@ -584,12 +589,11 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/reduction", "dpor"); /* Enable/disable timeout for wait requests with model-checking */ - default_value = xbt_strdup("off"); xbt_cfg_register(&_sg_cfg_set, "model-check/timeout", "Enable/Disable timeout for wait requests", xbt_cfgelm_boolean, NULL, 0, 1, _mc_cfg_cb_timeout, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/timeout", default_value); + 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", @@ -614,13 +618,12 @@ void sg_config_init(int *argc, char **argv) #endif /* do verbose-exit */ - default_value = xbt_strdup("on"); xbt_cfg_register(&_sg_cfg_set, "verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C", - xbt_cfgelm_boolean, &default_value, 0, 1, + xbt_cfgelm_boolean, NULL, 0, 1, _sg_cfg_cb_verbose_exit, NULL); - - + xbt_cfg_setdefault_boolean(_sg_cfg_set, "verbose-exit", "yes"); + /* context factory */ default_value = xbt_strdup("ucontext"); xbt_cfg_register(&_sg_cfg_set, "contexts/factory", @@ -659,19 +662,17 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, &default_value, 1, 1, _sg_cfg_cb_contexts_parallel_mode, NULL); - default_value = xbt_strdup("no"); xbt_cfg_register(&_sg_cfg_set, "network/coordinates", "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)", - xbt_cfgelm_boolean, &default_value, 1, 1, + xbt_cfgelm_boolean, NULL, 1, 1, _sg_cfg_cb__surf_network_coordinates, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/coordinates", default_value); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/coordinates", "no"); - default_value = xbt_strdup("no"); 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, &default_value, 0, 1, + xbt_cfgelm_boolean, NULL, 0, 1, _sg_cfg_cb__surf_network_crosstraffic, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", default_value); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "no"); #ifdef HAVE_GTNETS xbt_cfg_register(&_sg_cfg_set, "gtnets/jitter", @@ -701,12 +702,17 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL, NULL); - default_value = xbt_strdup("no"); xbt_cfg_register(&_sg_cfg_set, "smpi/display_timing", "Boolean indicating whether we should display the timing after simulation.", - xbt_cfgelm_boolean, &default_value, 1, 1, NULL, + xbt_cfgelm_boolean, NULL, 1, 1, NULL, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/display_timing", default_value); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/display_timing", "no"); + + xbt_cfg_register(&_sg_cfg_set, "smpi/use_shared_malloc", + "Boolean indicating whether we should use shared memory when using SMPI_SHARED_MALLOC. Allows user to disable it for debug purposes.", + xbt_cfgelm_boolean, NULL, 1, 1, NULL, + NULL); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/use_shared_malloc", "yes"); double default_threshold = 1e-6; xbt_cfg_register(&_sg_cfg_set, "smpi/cpu_threshold", @@ -767,68 +773,74 @@ void sg_config_init(int *argc, char **argv) NULL); default_value = xbt_strdup("default"); xbt_cfg_register(&_sg_cfg_set, "smpi/coll_selector", - "Which collective selector to use", - xbt_cfgelm_string, &default_value, 1, 1, NULL, - NULL); - - xbt_cfg_register(&_sg_cfg_set, "smpi/gather", - "Which collective to use for gather", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_gather, - NULL); - + "Which collective selector to use", + xbt_cfgelm_string, &default_value, 1, 1, NULL, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/gather", + "Which collective to use for gather", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_gather, + NULL); + xbt_cfg_register(&_sg_cfg_set, "smpi/allgather", - "Which collective to use for allgather", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allgather, - NULL); + "Which collective to use for allgather", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allgather, + NULL); xbt_cfg_register(&_sg_cfg_set, "smpi/barrier", - "Which collective to use for barrier", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_barrier, - NULL); + "Which collective to use for barrier", + xbt_cfgelm_string, NULL, 1, 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, NULL, 1, 1, &_sg_cfg_cb__coll_reduce_scatter, - NULL); + "Which collective to use for reduce_scatter", + xbt_cfgelm_string, NULL, 1, 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, NULL, 1, 1, &_sg_cfg_cb__coll_scatter, - NULL); + "Which collective to use for scatter", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_scatter, + NULL); xbt_cfg_register(&_sg_cfg_set, "smpi/allgatherv", - "Which collective to use for allgatherv", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allgatherv, - NULL); + "Which collective to use for allgatherv", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allgatherv, + NULL); xbt_cfg_register(&_sg_cfg_set, "smpi/allreduce", - "Which collective to use for allreduce", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allreduce, - NULL); + "Which collective to use for allreduce", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allreduce, + NULL); xbt_cfg_register(&_sg_cfg_set, "smpi/alltoall", - "Which collective to use for alltoall", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_alltoall, - NULL); + "Which collective to use for alltoall", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_alltoall, + NULL); xbt_cfg_register(&_sg_cfg_set, "smpi/alltoallv", - "Which collective to use for alltoallv", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_alltoallv, - NULL); + "Which collective to use for alltoallv", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_alltoallv, + NULL); xbt_cfg_register(&_sg_cfg_set, "smpi/bcast", - "Which collective to use for bcast", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_bcast, - NULL); + "Which collective to use for bcast", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_bcast, + NULL); xbt_cfg_register(&_sg_cfg_set, "smpi/reduce", - "Which collective to use for reduce", - xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_reduce, - NULL); + "Which collective to use for reduce", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_reduce, + NULL); #endif // HAVE_SMPI + xbt_cfg_register(&_sg_cfg_set, "clean_atexit", + "\"yes\" or \"no\". \"yes\" enables all the cleanups of SimGrid (XBT,SIMIX,MSG) to be registered with atexit. \"no\" may be useful if your code segfaults when calling the exit function.", + xbt_cfgelm_boolean, NULL, 1, 1, + _sg_cfg_cb_clean_atexit, NULL); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "clean_atexit", "yes"); + if (!surf_path) { - /* retrieves the current directory of the current process */ + /* retrieves the current directory of the current process */ const char *initial_path = __surf_get_initial_path(); xbt_assert((initial_path), "__surf_get_initial_path() failed! Can't resolves current Windows directory"); @@ -878,15 +890,13 @@ void surf_config_models_setup() * the right net/cpu models. */ - if((!xbt_cfg_is_default_value(_sg_cfg_set, "network/model") || - !xbt_cfg_is_default_value(_sg_cfg_set, "cpu/model")) && - xbt_cfg_is_default_value(_sg_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(_sg_cfg_set, "workstation/model", val); - workstation_model_name = (char *) "compound"; + if ((!xbt_cfg_is_default_value(_sg_cfg_set, "network/model") || + !xbt_cfg_is_default_value(_sg_cfg_set, "cpu/model")) && + xbt_cfg_is_default_value(_sg_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(_sg_cfg_set, "workstation/model", val); + workstation_model_name = (char *) "compound"; } XBT_DEBUG("Workstation model: %s", workstation_model_name); @@ -933,25 +943,30 @@ void surf_config_models_setup() int sg_cfg_get_int(const char* name) { - return xbt_cfg_get_int(_sg_cfg_set,name); + return xbt_cfg_get_int(_sg_cfg_set,name); } + double sg_cfg_get_double(const char* name) { - return xbt_cfg_get_double(_sg_cfg_set,name); + return xbt_cfg_get_double(_sg_cfg_set,name); } + char* sg_cfg_get_string(const char* name) { - return xbt_cfg_get_string(_sg_cfg_set,name); + return xbt_cfg_get_string(_sg_cfg_set,name); } + int sg_cfg_get_boolean(const char* name) { - return xbt_cfg_get_boolean(_sg_cfg_set,name); + return xbt_cfg_get_boolean(_sg_cfg_set,name); } + void sg_cfg_get_peer(const char *name, char **peer, int *port) { - xbt_cfg_get_peer(_sg_cfg_set,name, peer, port); + xbt_cfg_get_peer(_sg_cfg_set,name, peer, port); } + xbt_dynar_t sg_cfg_get_dynar(const char* name) { - return xbt_cfg_get_dynar(_sg_cfg_set,name); + return xbt_cfg_get_dynar(_sg_cfg_set,name); }