X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f646472eb2d52b33a9be7450259564ac890ea99..c52c503d21e54cc4ff15a64060c2eb0b265f5f73:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index de7938f623..7cafc923a7 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -8,6 +8,7 @@ #include "xbt/misc.h" #include "xbt/config.h" +#include "xbt/config.hpp" #include "xbt/log.h" #include "xbt/mallocator.h" #include "xbt/str.h" @@ -47,21 +48,20 @@ static void sg_config_cmd_line(int *argc, char **argv) { int shall_exit = 0; int i, j; - char *opt; for (j = i = 1; i < *argc; i++) { if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) { - opt = strchr(argv[i], '='); + char *opt = strchr(argv[i], '='); opt++; - xbt_cfg_set_parse(simgrid_config, opt); + xbt_cfg_set_parse(opt); XBT_DEBUG("Did apply '%s' as config setting", opt); } else if (!strcmp(argv[i], "--version")) { printf("%s\n", SIMGRID_VERSION_STRING); shall_exit = 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(simgrid_config); + xbt_cfg_help(); printf( "\n" "Each of these configurations can be used by adding\n" @@ -79,19 +79,17 @@ static void sg_config_cmd_line(int *argc, char **argv) shall_exit = 1; } else if (!strcmp(argv[i], "--help-aliases")) { printf("Here is a list of all deprecated option names, with their replacement.\n"); - xbt_cfg_aliases(simgrid_config); + xbt_cfg_aliases(); printf("Please consider using the recent names\n"); shall_exit = 1; } else if (!strcmp(argv[i], "--help-models")) { - int k; - model_help("host", surf_host_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 (k = 0; surf_optimization_mode_description[k].name; k++) + for (int 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); @@ -105,7 +103,7 @@ static void sg_config_cmd_line(int *argc, char **argv) } } if (j < *argc) { - argv[j] = NULL; + argv[j] = nullptr; *argc = j; } if (shall_exit) @@ -113,23 +111,25 @@ static void sg_config_cmd_line(int *argc, char **argv) } /* callback of the plugin variable */ -static void _sg_cfg_cb__plugin(const char *name, int pos) +static void _sg_cfg_cb__plugin(const char *name) { xbt_assert(_sg_cfg_init_status < 2, "Cannot load a plugin after the initialization"); char *val = xbt_cfg_get_string(name); + if (val==nullptr || val[0] == '\0') + return; + if (!strcmp(val, "help")) { model_help("plugin", surf_plugin_description); sg_cfg_exit_early(); } - /* New Module missing */ int plugin_id = find_model_description(surf_plugin_description, val); surf_plugin_description[plugin_id].model_init_preparse(); } /* callback of the host/model variable */ -static void _sg_cfg_cb__host_model(const char *name, int pos) +static void _sg_cfg_cb__host_model(const char *name) { xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); @@ -144,7 +144,7 @@ static void _sg_cfg_cb__host_model(const char *name, int pos) } /* callback of the vm/model variable */ -static void _sg_cfg_cb__vm_model(const char *name, int pos) +static void _sg_cfg_cb__vm_model(const char *name) { xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); @@ -159,7 +159,7 @@ static void _sg_cfg_cb__vm_model(const char *name, int pos) } /* callback of the cpu/model variable */ -static void _sg_cfg_cb__cpu_model(const char *name, int pos) +static void _sg_cfg_cb__cpu_model(const char *name) { xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); @@ -174,15 +174,11 @@ static void _sg_cfg_cb__cpu_model(const char *name, int pos) } /* callback of the cpu/model variable */ -static void _sg_cfg_cb__optimization_mode(const char *name, int pos) +static void _sg_cfg_cb__optimization_mode(const char *name) { - char *val; - - xbt_assert(_sg_cfg_init_status < 2, - "Cannot change the model after the initialization"); - - val = xbt_cfg_get_string(name); + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); + char *val = xbt_cfg_get_string(name); if (!strcmp(val, "help")) { model_help("optimization", surf_optimization_mode_description); sg_cfg_exit_early(); @@ -193,34 +189,25 @@ static void _sg_cfg_cb__optimization_mode(const char *name, int pos) } /* callback of the cpu/model variable */ -static void _sg_cfg_cb__storage_mode(const char *name, int pos) +static void _sg_cfg_cb__storage_mode(const char *name) { - char *val; - - xbt_assert(_sg_cfg_init_status < 2, - "Cannot change the model after the initialization"); - - val = xbt_cfg_get_string(name); + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); + char *val = xbt_cfg_get_string(name); if (!strcmp(val, "help")) { model_help("storage", surf_storage_model_description); sg_cfg_exit_early(); } - /* New Module missing */ find_model_description(surf_storage_model_description, val); } /* callback of the network_model variable */ -static void _sg_cfg_cb__network_model(const char *name, int pos) +static void _sg_cfg_cb__network_model(const char *name) { - char *val; - - xbt_assert(_sg_cfg_init_status < 2, - "Cannot change the model after the initialization"); - - val = xbt_cfg_get_string(name); + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); + char *val = xbt_cfg_get_string(name); if (!strcmp(val, "help")) { model_help("network", surf_network_model_description); sg_cfg_exit_early(); @@ -230,185 +217,114 @@ 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) -{ - sg_tcp_gamma = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__maxmin_precision(const char* name, int pos) -{ - sg_maxmin_precision = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__surf_precision(const char* name, int pos) -{ - sg_surf_precision = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__sender_gap(const char* name, int pos) -{ - sg_sender_gap = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__latency_factor(const char *name, int pos) -{ - sg_latency_factor = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__bandwidth_factor(const char *name, int pos) -{ - sg_bandwidth_factor = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__weight_S(const char *name, int pos) -{ - sg_weight_S_parameter = xbt_cfg_get_double(name); -} - #if HAVE_SMPI -/* callback of the mpi collectives */ -static void _sg_cfg_cb__coll(const char *category, +/* callback of the mpi collectives: simply check that this is a valid name. It will be picked up in smpi_global.cpp */ +static void _check_coll(const char *category, s_mpi_coll_description_t * table, - const char *name, int pos) + const char *name) { - char *val; - - xbt_assert(_sg_cfg_init_status < 2, - "Cannot change the model after the initialization"); + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the collective algorithm after the initialization"); - val = xbt_cfg_get_string(name); - - if (!strcmp(val, "help")) { + char *val = xbt_cfg_get_string(name); + if (val && !strcmp(val, "help")) { coll_help(category, table); sg_cfg_exit_early(); } - /* New Module missing */ find_coll_description(table, val, category); } -static void _sg_cfg_cb__coll_gather(const char *name, int pos){ - _sg_cfg_cb__coll("gather", mpi_coll_gather_description, name, pos); +static void _check_coll_gather(const char *name){ + _check_coll("gather", mpi_coll_gather_description, name); } -static void _sg_cfg_cb__coll_allgather(const char *name, int pos){ - _sg_cfg_cb__coll("allgather", mpi_coll_allgather_description, name, pos); +static void _check_coll_allgather(const char *name){ + _check_coll("allgather", mpi_coll_allgather_description, name); } -static void _sg_cfg_cb__coll_allgatherv(const char *name, int pos){ - _sg_cfg_cb__coll("allgatherv", mpi_coll_allgatherv_description, name, pos); +static void _check_coll_allgatherv(const char *name){ + _check_coll("allgatherv", mpi_coll_allgatherv_description, name); } -static void _sg_cfg_cb__coll_allreduce(const char *name, int pos) +static void _check_coll_allreduce(const char *name) { - _sg_cfg_cb__coll("allreduce", mpi_coll_allreduce_description, name, pos); + _check_coll("allreduce", mpi_coll_allreduce_description, name); } -static void _sg_cfg_cb__coll_alltoall(const char *name, int pos) +static void _check_coll_alltoall(const char *name) { - _sg_cfg_cb__coll("alltoall", mpi_coll_alltoall_description, name, pos); + _check_coll("alltoall", mpi_coll_alltoall_description, name); } -static void _sg_cfg_cb__coll_alltoallv(const char *name, int pos) +static void _check_coll_alltoallv(const char *name) { - _sg_cfg_cb__coll("alltoallv", mpi_coll_alltoallv_description, name, pos); + _check_coll("alltoallv", mpi_coll_alltoallv_description, name); } -static void _sg_cfg_cb__coll_bcast(const char *name, int pos) +static void _check_coll_bcast(const char *name) { - _sg_cfg_cb__coll("bcast", mpi_coll_bcast_description, name, pos); + _check_coll("bcast", mpi_coll_bcast_description, name); } -static void _sg_cfg_cb__coll_reduce(const char *name, int pos) +static void _check_coll_reduce(const char *name) { - _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); + _check_coll("reduce", mpi_coll_reduce_description, name); } -static void _sg_cfg_cb__coll_scatter(const char *name, int pos){ - _sg_cfg_cb__coll("scatter", mpi_coll_scatter_description, name, pos); +static void _check_coll_reduce_scatter(const char *name){ + _check_coll("reduce_scatter", mpi_coll_reduce_scatter_description, name); } -static void _sg_cfg_cb__coll_barrier(const char *name, int pos){ - _sg_cfg_cb__coll("barrier", mpi_coll_barrier_description, name, pos); -} - -static void _sg_cfg_cb__wtime_sleep(const char *name, int pos){ - smpi_wtime_sleep = xbt_cfg_get_double(name); +static void _check_coll_scatter(const char *name){ + _check_coll("scatter", mpi_coll_scatter_description, name); } - -static void _sg_cfg_cb__iprobe_sleep(const char *name, int pos){ - smpi_iprobe_sleep = xbt_cfg_get_double(name); -} - -static void _sg_cfg_cb__test_sleep(const char *name, int pos){ - smpi_test_sleep = xbt_cfg_get_double(name); +static void _check_coll_barrier(const char *name){ + _check_coll("barrier", mpi_coll_barrier_description, name); } - - #endif -/* callback of the inclusion path */ -static void _sg_cfg_cb__surf_path(const char *name, int pos) -{ - char *path = xbt_strdup(xbt_cfg_get_string_at(simgrid_config, name, pos)); - xbt_dynar_push(surf_path, &path); -} - /* callback to decide if we want to use the model-checking */ #include "src/xbt_modinter.h" -#if HAVE_MC -extern int _sg_do_model_check; /* this variable lives in xbt_main until I find a right location for it */ -extern int _sg_do_model_check_record; -#endif - -static void _sg_cfg_cb_model_check_replay(const char *name, int pos) { +static void _sg_cfg_cb_model_check_replay(const char *name) { MC_record_path = xbt_cfg_get_string(name); + if (MC_record_path[0] == '\0') + MC_record_path = nullptr; } #if HAVE_MC -static void _sg_cfg_cb_model_check_record(const char *name, int pos) { +extern int _sg_do_model_check_record; +static void _sg_cfg_cb_model_check_record(const char *name) { _sg_do_model_check_record = xbt_cfg_get_boolean(name); } #endif extern int _sg_do_verbose_exit; - -static void _sg_cfg_cb_verbose_exit(const char *name, int pos) +static void _sg_cfg_cb_verbose_exit(const char *name) { _sg_do_verbose_exit = xbt_cfg_get_boolean(name); } extern int _sg_do_clean_atexit; - -static void _sg_cfg_cb_clean_atexit(const char *name, int pos) +static void _sg_cfg_cb_clean_atexit(const char *name) { _sg_do_clean_atexit = xbt_cfg_get_boolean(name); } -static void _sg_cfg_cb_context_factory(const char *name, int pos) -{ - smx_context_factory_name = xbt_cfg_get_string(name); -} - -static void _sg_cfg_cb_context_stack_size(const char *name, int pos) +static void _sg_cfg_cb_context_stack_size(const char *name) { smx_context_stack_size_was_set = 1; smx_context_stack_size = xbt_cfg_get_int(name) * 1024; } -static void _sg_cfg_cb_context_guard_size(const char *name, int pos) +static void _sg_cfg_cb_context_guard_size(const char *name) { smx_context_guard_size_was_set = 1; smx_context_guard_size = xbt_cfg_get_int(name) * xbt_pagesize; } -static void _sg_cfg_cb_contexts_nthreads(const char *name, int pos) +static void _sg_cfg_cb_contexts_nthreads(const char *name) { SIMIX_context_set_nthreads(xbt_cfg_get_int(name)); } -static void _sg_cfg_cb_contexts_parallel_threshold(const char *name, int pos) +static void _sg_cfg_cb_contexts_parallel_threshold(const char *name) { SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(name)); } -static void _sg_cfg_cb_contexts_parallel_mode(const char *name, int pos) +static void _sg_cfg_cb_contexts_parallel_mode(const char *name) { const char* mode_name = xbt_cfg_get_string(name); if (!strcmp(mode_name, "posix")) { @@ -426,8 +342,7 @@ static void _sg_cfg_cb_contexts_parallel_mode(const char *name, int pos) } } -static void _sg_cfg_cb__surf_network_coordinates(const char *name, - int pos) +static void _sg_cfg_cb__surf_network_coordinates(const char *name) { static int already_set = 0; int val = xbt_cfg_get_boolean(name); @@ -442,278 +357,283 @@ static void _sg_cfg_cb__surf_network_coordinates(const char *name, xbt_die("Setting of whether to use coordinate cannot be disabled once set."); } -static void _sg_cfg_cb__surf_network_crosstraffic(const char *name, - int pos) +static void _sg_cfg_cb__surf_network_crosstraffic(const char *name) { sg_network_crosstraffic = xbt_cfg_get_boolean(name); } /* build description line with possible values */ -static void describe_model(char *result, +static void describe_model(char *result,int resultsize, const s_surf_model_description_t model_description[], const char *name, const char *description) { - char *p = result + - sprintf(result, "%s. Possible values: %s", description, + result[0] = '\0'; + char *p = result; + p += snprintf(result,resultsize-1, "%s. Possible values: %s", description, model_description[0].name ? model_description[0].name : "n/a"); - int i; - for (i = 1; model_description[i].name; i++) - p += sprintf(p, ", %s", model_description[i].name); - sprintf(p, - ".\n (use 'help' as a value to see the long description of each %s)", - name); + for (int i = 1; model_description[i].name; i++) + p += snprintf(p,resultsize-(p-result)-1, ", %s", model_description[i].name); + p += snprintf(p,resultsize-(p-result)-1, ".\n (use 'help' as a value to see the long description of each %s)", name); + + xbt_assert(p("path", + "Lookup path for inclusions in platform and deployment XML files", + "", + [](std::string const& path) { + if (path[0] != '\0') { + char* copy = xbt_strdup(path.c_str()); + xbt_dynar_push(surf_path, ©); + } + }); + + xbt_cfg_register_boolean("cpu/maxmin-selective-update", "no", nullptr, + "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)"); + xbt_cfg_register_alias("cpu/maxmin-selective-update","cpu/maxmin_selective_update"); + xbt_cfg_register_boolean("network/maxmin-selective-update", "no", nullptr, + "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)"); + xbt_cfg_register_alias("network/maxmin-selective-update","network/maxmin_selective_update"); /* Replay (this part is enabled even if MC it disabled) */ - xbt_cfg_register(&simgrid_config, "model-check/replay", "Enable replay mode with the given path", xbt_cfgelm_string, 0, 1, _sg_cfg_cb_model_check_replay); + xbt_cfg_register_string("model-check/replay", nullptr, _sg_cfg_cb_model_check_replay, + "Model-check path to replay (as reported by SimGrid when a violation is reported)"); #if HAVE_MC /* do model-checking-record */ - xbt_cfg_register_boolean("model-check/record", "Record the model-checking paths", "no", _sg_cfg_cb_model_check_record); + xbt_cfg_register_boolean("model-check/record", "no", _sg_cfg_cb_model_check_record, "Record the model-checking paths"); - xbt_cfg_register_int("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.", - 0, _mc_cfg_cb_checkpoint); + xbt_cfg_register_int("model-check/checkpoint", 0, _mc_cfg_cb_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_cfg_register_boolean("model-check/sparse_checkpoint", "Use sparse per-page snapshots.", "no", _mc_cfg_cb_sparse_checkpoint); - xbt_cfg_register_boolean("model-check/soft-dirty", "Use sparse per-page snapshots.", "no", _mc_cfg_cb_soft_dirty); - xbt_cfg_register_boolean("model-check/ksm", "Kernel same-page merging", "no", _mc_cfg_cb_ksm); + xbt_cfg_register_boolean("model-check/sparse-checkpoint", "no", _mc_cfg_cb_sparse_checkpoint, "Use sparse per-page snapshots."); + xbt_cfg_register_boolean("model-check/ksm", "no", _mc_cfg_cb_ksm, "Kernel same-page merging"); - xbt_cfg_register_string("model-check/property", "Name of the file containing the property, as formated by the ltl2ba program.", - "", _mc_cfg_cb_property); + xbt_cfg_register_string("model-check/property","", _mc_cfg_cb_property, + "Name of the file containing the property, as formated by the ltl2ba program."); + xbt_cfg_register_boolean("model-check/communications-determinism", "no", _mc_cfg_cb_comms_determinism, + "Whether to enable the detection of communication determinism"); + xbt_cfg_register_alias("model-check/communications-determinism","model-check/communications_determinism"); - xbt_cfg_register_boolean("model-check/communications_determinism", - "Whether to enable the detection of communication determinism", "no", _mc_cfg_cb_comms_determinism); - - xbt_cfg_register_boolean("model-check/send_determinism", - "Enable/disable the detection of send-determinism in the communications schemes", "no", _mc_cfg_cb_send_determinism); + xbt_cfg_register_boolean("model-check/send-determinism", "no", _mc_cfg_cb_send_determinism, + "Enable/disable the detection of send-determinism in the communications schemes"); + xbt_cfg_register_alias("model-check/send-determinism","model-check/send_determinism"); /* Specify the kind of model-checking reduction */ - xbt_cfg_register_string("model-check/reduction", "Specify the kind of exploration reduction (either none or DPOR)", "dpor", _mc_cfg_cb_reduce); - xbt_cfg_register_boolean("model-check/timeout", "Whether to enable timeouts for wait requests", "no", _mc_cfg_cb_timeout); - - xbt_cfg_register_boolean("model-check/hash", "Whether to enable state hash for state comparison (experimental)", "no", _mc_cfg_cb_hash); - xbt_cfg_register_boolean("model-check/snapshot_fds", "Whether file descriptors must be snapshoted (currently unusable)", "no", _mc_cfg_cb_snapshot_fds); - xbt_cfg_register_int("model-check/max_depth", "Maximal exploration depth (default: 1000)", 1000, _mc_cfg_cb_max_depth); - xbt_cfg_register_int("model-check/visited", - "Specify the number of visited state stored for state comparison reduction. If value=5, the last 5 visited states are stored. If value=0 (the default), all states are stored.", - 0, _mc_cfg_cb_visited); - - xbt_cfg_register_string("model-check/dot_output", "Name of dot output file corresponding to graph state", "", _mc_cfg_cb_dot_output); - xbt_cfg_register_boolean("model-check/termination", "Whether to enable non progressive cycle detection", "no", _mc_cfg_cb_termination); + xbt_cfg_register_string("model-check/reduction", "dpor", _mc_cfg_cb_reduce, + "Specify the kind of exploration reduction (either none or DPOR)"); + xbt_cfg_register_boolean("model-check/timeout", "no", _mc_cfg_cb_timeout, + "Whether to enable timeouts for wait requests"); + + xbt_cfg_register_boolean("model-check/hash", "no", _mc_cfg_cb_hash, "Whether to enable state hash for state comparison (experimental)"); + xbt_cfg_register_boolean("model-check/snapshot-fds", "no", _mc_cfg_cb_snapshot_fds, + "Whether file descriptors must be snapshoted (currently unusable)"); + xbt_cfg_register_alias("model-check/snapshot-fds","model-check/snapshot_fds"); + xbt_cfg_register_int("model-check/max-depth", 1000, _mc_cfg_cb_max_depth, "Maximal exploration depth (default: 1000)"); + xbt_cfg_register_alias("model-check/max-depth","model-check/max_depth"); + xbt_cfg_register_int("model-check/visited", 0, _mc_cfg_cb_visited, + "Specify the number of visited state stored for state comparison reduction. If value=5, the last 5 visited states are stored. If value=0 (the default), all states are stored."); + + xbt_cfg_register_string("model-check/dot-output", "", _mc_cfg_cb_dot_output, "Name of dot output file corresponding to graph state"); + xbt_cfg_register_alias("model-check/dot-output","model-check/dot_output"); + xbt_cfg_register_boolean("model-check/termination", "no", _mc_cfg_cb_termination, "Whether to enable non progressive cycle detection"); #endif - xbt_cfg_register_boolean("verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C", "yes", _sg_cfg_cb_verbose_exit); - - /* context factory */ - const char *dflt_ctx_fact = "thread"; - { - char *p = description + - sprintf(description, - "Context factory to use in SIMIX. Possible values: %s", - dflt_ctx_fact); -#if HAVE_UCONTEXT_CONTEXTS - dflt_ctx_fact = "ucontext"; - p += sprintf(p, ", %s", dflt_ctx_fact); -#endif -#if HAVE_RAW_CONTEXTS - dflt_ctx_fact = "raw"; - p += sprintf(p, ", %s", dflt_ctx_fact); -#endif - sprintf(p, "."); - } - xbt_cfg_register_string("contexts/factory", description, dflt_ctx_fact, _sg_cfg_cb_context_factory); + xbt_cfg_register_boolean("verbose-exit", "yes", _sg_cfg_cb_verbose_exit, "Activate the \"do nothing\" mode in Ctrl-C"); - xbt_cfg_register_int("contexts/stack_size", "Stack size of contexts in KiB", 8*1024, _sg_cfg_cb_context_stack_size); + xbt_cfg_register_int("contexts/stack-size", 8*1024, _sg_cfg_cb_context_stack_size, "Stack size of contexts in KiB"); /* (FIXME: this is unpleasant) Reset this static variable that was altered when setting the default value. */ smx_context_stack_size_was_set = 0; + xbt_cfg_register_alias("contexts/stack-size","contexts/stack_size"); /* guard size for contexts stacks in memory pages */ - xbt_cfg_register_int("contexts/guard_size", "Guard size for contexts stacks in memory pages", + xbt_cfg_register_int("contexts/guard-size", #if defined(_WIN32) || (PTH_STACKGROWTH != -1) - 0, _sg_cfg_cb_context_guard_size); + 0, #else - 1, _sg_cfg_cb_context_guard_size); + 1, #endif + _sg_cfg_cb_context_guard_size, "Guard size for contexts stacks in memory pages"); /* No, it was not set yet (the above setdefault() changed this to 1). */ smx_context_guard_size_was_set = 0; + xbt_cfg_register_alias("contexts/guard-size","contexts/guard_size"); + xbt_cfg_register_int("contexts/nthreads", 1, _sg_cfg_cb_contexts_nthreads, "Number of parallel threads used to execute user contexts"); - xbt_cfg_register_int("contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, _sg_cfg_cb_contexts_nthreads); - - xbt_cfg_register_int("contexts/parallel_threshold", "Minimal number of user contexts to be run in parallel (raw contexts only)", - 2, _sg_cfg_cb_contexts_parallel_threshold); + xbt_cfg_register_int("contexts/parallel-threshold", 2, _sg_cfg_cb_contexts_parallel_threshold, + "Minimal number of user contexts to be run in parallel (raw contexts only)"); + xbt_cfg_register_alias("contexts/parallel-threshold","contexts/parallel_threshold"); /* synchronization mode for parallel user contexts */ - xbt_cfg_register_string("contexts/synchro", "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)", #if HAVE_FUTEX_H - "futex", _sg_cfg_cb_contexts_parallel_mode); + xbt_cfg_register_string("contexts/synchro", "futex", _sg_cfg_cb_contexts_parallel_mode, + "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)"); #else //No futex on mac and posix is unimplememted yet - "busy_wait", _sg_cfg_cb_contexts_parallel_mode); + xbt_cfg_register_string("contexts/synchro", "busy_wait", _sg_cfg_cb_contexts_parallel_mode, + "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)"); #endif - xbt_cfg_register_boolean("network/coordinates", "Whether we use a coordinate-based routing (as Vivaldi)", - "no", _sg_cfg_cb__surf_network_coordinates); - - xbt_cfg_register_boolean("network/crosstraffic", "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)", - "yes", _sg_cfg_cb__surf_network_crosstraffic); + xbt_cfg_register_boolean("network/coordinates", "no", _sg_cfg_cb__surf_network_coordinates, + "Whether we use a coordinate-based routing (as Vivaldi)"); -#if HAVE_NS3 - xbt_cfg_register_string("ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default", NULL); -#endif + xbt_cfg_register_boolean("network/crosstraffic", "yes", _sg_cfg_cb__surf_network_crosstraffic, + "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)"); //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 // SMPI model can be used without enable_smpi, so keep this out of the ifdef. - xbt_cfg_register_string("smpi/bw_factor", "Bandwidth factors for smpi.", - "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084", NULL); - - xbt_cfg_register_string("smpi/lat_factor", "Latency factors for smpi.", - "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467", NULL); + xbt_cfg_register_string("smpi/bw-factor", + "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084", nullptr, + "Bandwidth factors for smpi. Format: 'threshold0:value0;threshold1:value1;...;thresholdN:valueN', meaning if(size >=thresholdN ) return valueN."); + xbt_cfg_register_alias("smpi/bw-factor","smpi/bw_factor"); + + xbt_cfg_register_string("smpi/lat-factor", + "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467", nullptr, "Latency factors for smpi."); + xbt_cfg_register_alias("smpi/lat-factor","smpi/lat_factor"); - xbt_cfg_register_string("smpi/IB_penalty_factors", - "Correction factor to communications using Infiniband model with contention (default value based on Stampede cluster profiling)", - "0.965;0.925;1.35", NULL); + xbt_cfg_register_string("smpi/IB-penalty-factors", "0.965;0.925;1.35", nullptr, + "Correction factor to communications using Infiniband model with contention (default value based on Stampede cluster profiling)"); + xbt_cfg_register_alias("smpi/IB-penalty-factors","smpi/IB_penalty_factors"); #if HAVE_SMPI - xbt_cfg_register_double("smpi/running_power", "Power of the host running the simulation (in flop/s). Used to bench the operations.", 20000.0, NULL); - xbt_cfg_register_boolean("smpi/display_timing", "Whether we should display the timing after simulation.", "no", NULL); - xbt_cfg_register_boolean("smpi/simulate_computation", "Whether the computational part of the simulated application should be simulated.", "yes", NULL); - xbt_cfg_register_boolean("smpi/use_shared_malloc", "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes.", "yes", NULL); - xbt_cfg_register_double("smpi/cpu_threshold", "Minimal computation time (in seconds) not discarded, or -1 for infinity.", 1e-6, NULL); - xbt_cfg_register_int("smpi/async_small_thresh", "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver", - 0, NULL); - xbt_cfg_register_int("smpi/send_is_detached_thresh", "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend", - 65536, NULL); - - xbt_cfg_register_boolean("smpi/privatize_global_variables", "Whether we should privatize global variable at runtime.", "no", NULL); - xbt_cfg_register_string("smpi/os", "Small messages timings (MPI_Send minimum time for small messages)", "1:0:0:0:0", NULL); - xbt_cfg_register_string("smpi/ois", "Small messages timings (MPI_Isend minimum time for small messages)", "1:0:0:0:0", NULL); - xbt_cfg_register_string("smpi/or", "Small messages timings (MPI_Recv minimum time for small messages)", "1:0:0:0:0", NULL); - xbt_cfg_register_double("smpi/iprobe", "Minimum time to inject inside a call to MPI_Iprobe", 1e-4, _sg_cfg_cb__iprobe_sleep); - xbt_cfg_register_double("smpi/test", "Minimum time to inject inside a call to MPI_Test", 1e-4, _sg_cfg_cb__test_sleep); - xbt_cfg_register_double("smpi/wtime", "Minimum time to inject inside a call to MPI_Wtime", 0.0, _sg_cfg_cb__wtime_sleep); - - xbt_cfg_register_string("smpi/coll_selector", "Which collective selector to use", "default", NULL); - - xbt_cfg_register(&simgrid_config, "smpi/gather", - "Which collective to use for gather", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_gather); - - xbt_cfg_register(&simgrid_config, "smpi/allgather", - "Which collective to use for allgather", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_allgather); - - xbt_cfg_register(&simgrid_config, "smpi/barrier", - "Which collective to use for barrier", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_barrier); - - xbt_cfg_register(&simgrid_config, "smpi/reduce_scatter", - "Which collective to use for reduce_scatter", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_reduce_scatter); - - xbt_cfg_register(&simgrid_config, "smpi/scatter", - "Which collective to use for scatter", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_scatter); - - xbt_cfg_register(&simgrid_config, "smpi/allgatherv", - "Which collective to use for allgatherv", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_allgatherv); - - xbt_cfg_register(&simgrid_config, "smpi/allreduce", - "Which collective to use for allreduce", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_allreduce); - - xbt_cfg_register(&simgrid_config, "smpi/alltoall", - "Which collective to use for alltoall", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_alltoall); - - xbt_cfg_register(&simgrid_config, "smpi/alltoallv", - "Which collective to use for alltoallv", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_alltoallv); - - xbt_cfg_register(&simgrid_config, "smpi/bcast", - "Which collective to use for bcast", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_bcast); - - xbt_cfg_register(&simgrid_config, "smpi/reduce", - "Which collective to use for reduce", - xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_reduce); + xbt_cfg_register_double("smpi/running-power", 20000.0, nullptr, "Power of the host running the simulation (in flop/s). Used to bench the operations."); + xbt_cfg_register_alias("smpi/running-power","smpi/running_power"); + + xbt_cfg_register_boolean("smpi/display-timing", "no", nullptr, "Whether we should display the timing after simulation."); + xbt_cfg_register_alias("smpi/display-timing", "smpi/display_timing"); + + xbt_cfg_register_boolean("smpi/simulate-computation", "yes", nullptr, "Whether the computational part of the simulated application should be simulated."); + xbt_cfg_register_alias("smpi/simulate-computation","smpi/simulate_computation"); + + xbt_cfg_register_boolean("smpi/use-shared-malloc", "yes", nullptr, "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes."); + xbt_cfg_register_alias("smpi/use-shared-malloc", "smpi/use_shared_malloc"); + + xbt_cfg_register_double("smpi/cpu-threshold", 1e-6, nullptr, "Minimal computation time (in seconds) not discarded, or -1 for infinity."); + xbt_cfg_register_alias("smpi/cpu-threshold", "smpi/cpu_threshold"); + + xbt_cfg_register_int("smpi/async-small-thresh", 0, nullptr, + "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver"); + xbt_cfg_register_alias("smpi/async-small-thresh","smpi/async_small_thresh"); + xbt_cfg_register_alias("smpi/async-small-thresh","smpi/async_small_thres"); + + xbt_cfg_register_boolean("smpi/trace-call-location", "no", nullptr, "Should filename and linenumber of MPI calls be traced?"); + + xbt_cfg_register_int("smpi/send-is-detached-thresh", 65536, nullptr, + "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend"); + xbt_cfg_register_alias("smpi/send-is-detached-thresh","smpi/send_is_detached_thresh"); + xbt_cfg_register_alias("smpi/send-is-detached-thresh","smpi/send_is_detached_thres"); + + xbt_cfg_register_boolean("smpi/privatize-global-variables", "no", nullptr, "Whether we should privatize global variable at runtime."); + xbt_cfg_register_alias("smpi/privatize-global-variables", "smpi/privatize_global_variables"); + +#if HAVE_PAPI + xbt_cfg_register_string("smpi/papi-events", nullptr, nullptr, "This switch enables tracking the specified counters with PAPI"); +#endif + xbt_cfg_register_string("smpi/comp-adjustment-file", nullptr, nullptr, "A file containing speedups or slowdowns for some parts of the code."); + xbt_cfg_register_string("smpi/os", "0:0:0:0:0", nullptr, "Small messages timings (MPI_Send minimum time for small messages)"); + xbt_cfg_register_string("smpi/ois", "0:0:0:0:0", nullptr, "Small messages timings (MPI_Isend minimum time for small messages)"); + xbt_cfg_register_string("smpi/or", "0:0:0:0:0", nullptr, "Small messages timings (MPI_Recv minimum time for small messages)"); + + xbt_cfg_register_string("smpi/coll-selector", "default", nullptr, "Which collective selector to use"); + xbt_cfg_register_alias("smpi/coll-selector","smpi/coll_selector"); + xbt_cfg_register_string("smpi/gather", nullptr, &_check_coll_gather, "Which collective to use for gather"); + xbt_cfg_register_string("smpi/allgather", nullptr, &_check_coll_allgather, "Which collective to use for allgather"); + xbt_cfg_register_string("smpi/barrier", nullptr, &_check_coll_barrier, "Which collective to use for barrier"); + xbt_cfg_register_string("smpi/reduce-scatter",nullptr, &_check_coll_reduce_scatter, "Which collective to use for reduce_scatter"); + xbt_cfg_register_alias("smpi/reduce-scatter","smpi/reduce_scatter"); + xbt_cfg_register_string("smpi/scatter", nullptr, &_check_coll_scatter, "Which collective to use for scatter"); + xbt_cfg_register_string("smpi/allgatherv", nullptr, &_check_coll_allgatherv, "Which collective to use for allgatherv"); + xbt_cfg_register_string("smpi/allreduce", nullptr, &_check_coll_allreduce, "Which collective to use for allreduce"); + xbt_cfg_register_string("smpi/alltoall", nullptr, &_check_coll_alltoall, "Which collective to use for alltoall"); + xbt_cfg_register_string("smpi/alltoallv", nullptr, &_check_coll_alltoallv,"Which collective to use for alltoallv"); + xbt_cfg_register_string("smpi/bcast", nullptr, &_check_coll_bcast, "Which collective to use for bcast"); + xbt_cfg_register_string("smpi/reduce", nullptr, &_check_coll_reduce, "Which collective to use for reduce"); #endif // HAVE_SMPI - xbt_cfg_register_boolean("exception/cutpath", "Whether to cut all path information from call traces, used e.g. in exceptions.", "no", NULL); + /* Storage */ + + sg_storage_max_file_descriptors = 1024; + simgrid::config::bindFlag(sg_storage_max_file_descriptors, "storage/max_file_descriptors", + "Maximum number of concurrently opened files per host. Default is 1024"); + + /* Others */ - xbt_cfg_register_boolean("clean_atexit", "Whether to cleanup SimGrid (XBT,SIMIX,MSG) at exit. Disable it if your code segfaults at ending.", - "yes", _sg_cfg_cb_clean_atexit); + xbt_cfg_register_boolean("exception/cutpath", "no", nullptr, + "Whether to cut all path information from call traces, used e.g. in exceptions."); + + xbt_cfg_register_boolean("clean-atexit", "yes", _sg_cfg_cb_clean_atexit, + "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end."); + xbt_cfg_register_alias("clean-atexit","clean_atexit"); if (!surf_path) { /* retrieves the current directory of the current process */ @@ -724,7 +644,6 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_setdefault_string("path", initial_path); } - xbt_cfg_check(simgrid_config); _sg_cfg_init_status = 1; sg_config_cmd_line(argc, argv); @@ -743,33 +662,3 @@ void sg_config_finalize(void) xbt_cfg_free(&simgrid_config); _sg_cfg_init_status = 0; } - -int sg_cfg_is_default_value(const char *name) -{ - return xbt_cfg_is_default_value(name); -} - -int sg_cfg_get_int(const char* name) -{ - return xbt_cfg_get_int(name); -} - -double sg_cfg_get_double(const char* name) -{ - return xbt_cfg_get_double(name); -} - -char* sg_cfg_get_string(const char* name) -{ - return xbt_cfg_get_string(name); -} - -int sg_cfg_get_boolean(const char* name) -{ - return xbt_cfg_get_boolean(name); -} - -xbt_dynar_t sg_cfg_get_dynar(const char* name) -{ - return xbt_cfg_get_dynar(name); -}