X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff420e1906d916322427488153e45bf82d5c03dd..d50a590cfb08f9f45bab9fd355eed8dbdcf765ea:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index afb483b842..29ed3104fb 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -6,53 +6,65 @@ /* sg_config: configuration infrastructure for the simulation world */ #include "simgrid/sg_config.hpp" -#include "instr/instr_interface.hpp" #include "simgrid/instr.h" +#include "src/instr/instr_private.hpp" #include "src/internal_config.h" #include "src/kernel/lmm/maxmin.hpp" #include "src/mc/mc_config.hpp" #include "src/mc/mc_replay.hpp" #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" -#include "xbt/config.h" #include "xbt/config.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid"); +static simgrid::config::Flag cfg_continue_after_help + {"help-nostop", "Do not stop the execution when --help is found", false}; -/* 0: beginning of time (config cannot be changed yet); - * 1: initialized: cfg_set created (config can now be changed); +/** @brief Allow other libraries to react to the --help flag, too + * + * When finding --help on the command line, simgrid usually stops right after displaying its help message. + * If you are writing a library using simgrid, you may want to display your own help message before everything stops. + * If so, just call this function before having simgrid parsing the command line, and you will be given the control + * even if the user is asking for help. + */ +void sg_config_continue_after_help() +{ + cfg_continue_after_help = true; +} + +/* 0: beginning of time (config cannot be changed yet) + * 1: initialized: cfg_set created (config can now be changed) * 2: configured: command line parsed and config part of platform file was * integrated also, platform construction ongoing or done. * (Config cannot be changed anymore!) */ int _sg_cfg_init_status = 0; -/* instruct the upper layer (simix or simdag) to exit as soon as possible */ -int _sg_cfg_exit_asap = 0; - -#define sg_cfg_exit_early() do { _sg_cfg_exit_asap = 1; return; } while (0) - /* Parse the command line, looking for options */ static void sg_config_cmd_line(int *argc, char **argv) { - int shall_exit = 0; + bool shall_exit = false; int i; int j; + bool parse_args = true; // Stop parsing the parameters once we found '--' for (j = i = 1; i < *argc; i++) { - if (not strncmp(argv[i], "--cfg=", strlen("--cfg="))) { + if (not strcmp("--", argv[i])) { + parse_args = false; + // Remove that '--' from the arguments + } else if (parse_args && not strncmp(argv[i], "--cfg=", strlen("--cfg="))) { char *opt = strchr(argv[i], '='); opt++; - xbt_cfg_set_parse(opt); + simgrid::config::set_parse(opt); XBT_DEBUG("Did apply '%s' as config setting", opt); - } else if (not strcmp(argv[i], "--version")) { - printf("%s\n", SIMGRID_VERSION_STRING); - shall_exit = 1; - } else if (not strcmp(argv[i], "--cfg-help") || not strcmp(argv[i], "--help")) { + } else if (parse_args && not strcmp(argv[i], "--version")) { + sg_version(); + shall_exit = true; + } else if (parse_args && (not strcmp(argv[i], "--cfg-help") || not strcmp(argv[i], "--help"))) { printf("Description of the configuration accepted by this simulator:\n"); - xbt_cfg_help(); + simgrid::config::help(); printf( "\n" "Each of these configurations can be used by adding\n" @@ -67,28 +79,27 @@ static void sg_config_cmd_line(int *argc, char **argv) " --version to get SimGrid version information.\n" "\n" ); - shall_exit = 1; - } else if (not strcmp(argv[i], "--help-aliases")) { + shall_exit = not cfg_continue_after_help; + argv[j++] = argv[i]; // Preserve the --help in argv just in case someone else wants to see it + } else if (parse_args && not strcmp(argv[i], "--help-aliases")) { printf("Here is a list of all deprecated option names, with their replacement.\n"); - xbt_cfg_aliases(); + simgrid::config::show_aliases(); printf("Please consider using the recent names\n"); - shall_exit = 1; - } else if (not strcmp(argv[i], "--help-models")) { + shall_exit = true; + } else if (parse_args && not strcmp(argv[i], "--help-models")) { 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 (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); + for (auto const& item : surf_optimization_mode_description) + printf(" %s: %s\n", item.name, item.description); printf("Both network and CPU models have 'Lazy' as default optimization level\n\n"); - shall_exit = 1; - } else if (not strcmp(argv[i], "--help-tracing")) { - TRACE_help (1); - shall_exit = 1; + shall_exit = true; + } else if (parse_args && not strcmp(argv[i], "--help-tracing")) { + TRACE_help(); + shall_exit = true; } else { argv[j++] = argv[i]; } @@ -98,7 +109,7 @@ static void sg_config_cmd_line(int *argc, char **argv) *argc = j; } if (shall_exit) - sg_cfg_exit_early(); + exit(0); } /* callback of the plugin variable */ @@ -110,12 +121,12 @@ static void _sg_cfg_cb__plugin(const std::string& value) return; if (value == "help") { - model_help("plugin", surf_plugin_description); - sg_cfg_exit_early(); + model_help("plugin", *surf_plugin_description); + exit(0); } - int plugin_id = find_model_description(surf_plugin_description, value); - surf_plugin_description[plugin_id].model_init_preparse(); + int plugin_id = find_model_description(*surf_plugin_description, value); + (*surf_plugin_description)[plugin_id].model_init_preparse(); } /* callback of the host/model variable */ @@ -125,7 +136,7 @@ static void _sg_cfg_cb__host_model(const std::string& value) if (value == "help") { model_help("host", surf_host_model_description); - sg_cfg_exit_early(); + exit(0); } /* Make sure that the model exists */ @@ -139,7 +150,7 @@ static void _sg_cfg_cb__cpu_model(const std::string& value) if (value == "help") { model_help("CPU", surf_cpu_model_description); - sg_cfg_exit_early(); + exit(0); } /* New Module missing */ @@ -153,7 +164,7 @@ static void _sg_cfg_cb__optimization_mode(const std::string& value) if (value == "help") { model_help("optimization", surf_optimization_mode_description); - sg_cfg_exit_early(); + exit(0); } /* New Module missing */ @@ -167,7 +178,7 @@ static void _sg_cfg_cb__storage_mode(const std::string& value) if (value == "help") { model_help("storage", surf_storage_model_description); - sg_cfg_exit_early(); + exit(0); } find_model_description(surf_storage_model_description, value); @@ -180,7 +191,7 @@ static void _sg_cfg_cb__network_model(const std::string& value) if (value == "help") { model_help("network", surf_network_model_description); - sg_cfg_exit_early(); + exit(0); } /* New Module missing */ @@ -202,28 +213,24 @@ static void _sg_cfg_cb_contexts_parallel_mode(const std::string& mode_name) } /* build description line with possible values */ -static void describe_model(char *result,int resultsize, - const s_surf_model_description_t model_description[], - const char *name, - const char *description) +static void declare_model_flag(const std::string& name, const std::string& value, + const std::function& callback, + const std::vector& model_description, const std::string& type, + const std::string& descr) { - 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"); - 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(name, description, value, callback); } /* create the config set, register what should be and parse the command line*/ void sg_config_init(int *argc, char **argv) { - const int descsize = 1024; - char description[descsize]; - /* Create the configuration support */ if (_sg_cfg_init_status != 0) { /* Only create stuff if not already inited */ XBT_WARN("Call to sg_config_init() after initialization ignored"); @@ -231,74 +238,72 @@ void sg_config_init(int *argc, char **argv) } /* Plugins configuration */ - describe_model(description, descsize, surf_plugin_description, "plugin", "The plugins"); - simgrid::config::declareFlag("plugin", description, "", &_sg_cfg_cb__plugin); + declare_model_flag("plugin", "", &_sg_cfg_cb__plugin, *surf_plugin_description, "plugin", "The plugins"); - describe_model(description, descsize, surf_cpu_model_description, "model", "The model to use for the CPU"); - simgrid::config::declareFlag("cpu/model", description, "Cas01", &_sg_cfg_cb__cpu_model); + declare_model_flag("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, surf_cpu_model_description, "model", + "The model to use for the CPU"); - describe_model(description, descsize, surf_storage_model_description, "model", "The model to use for the storage"); - simgrid::config::declareFlag("storage/model", description, "default", &_sg_cfg_cb__storage_mode); + declare_model_flag("storage/model", "default", &_sg_cfg_cb__storage_mode, surf_storage_model_description, "model", + "The model to use for the storage"); - describe_model(description, descsize, surf_network_model_description, "model", "The model to use for the network"); - simgrid::config::declareFlag("network/model", description, "LV08", &_sg_cfg_cb__network_model); + declare_model_flag("network/model", "LV08", &_sg_cfg_cb__network_model, surf_network_model_description, "model", + "The model to use for the network"); - describe_model(description, descsize, surf_optimization_mode_description, "optimization mode", - "The optimization modes to use for the network"); - simgrid::config::declareFlag("network/optim", description, "Lazy", &_sg_cfg_cb__optimization_mode); + declare_model_flag("network/optim", "Lazy", &_sg_cfg_cb__optimization_mode, surf_optimization_mode_description, + "optimization mode", "The optimization modes to use for the network"); - describe_model(description, descsize, surf_host_model_description, "model", "The model to use for the host"); - simgrid::config::declareFlag("host/model", description, "default", &_sg_cfg_cb__host_model); + declare_model_flag("host/model", "default", &_sg_cfg_cb__host_model, surf_host_model_description, "model", + "The model to use for the host"); - simgrid::config::bindFlag(sg_surf_precision, "surf/precision", - "Numerical precision used when updating simulation times (in seconds)"); + simgrid::config::bind_flag(sg_surf_precision, "surf/precision", + "Numerical precision used when updating simulation times (in seconds)"); - simgrid::config::bindFlag(sg_maxmin_precision, "maxmin/precision", - "Numerical precision used when computing resource sharing (in flops/sec or bytes/sec)"); + simgrid::config::bind_flag(sg_maxmin_precision, "maxmin/precision", + "Numerical precision used when computing resource sharing (in flops/sec or bytes/sec)"); - simgrid::config::bindFlag(sg_concurrency_limit, "maxmin/concurrency-limit", {"maxmin/concurrency_limit"}, - "Maximum number of concurrent variables in the maxmim system. Also limits the number of " - "processes on each host, at higher level. (default: -1 means no such limitation)"); + simgrid::config::bind_flag(sg_concurrency_limit, "maxmin/concurrency-limit", {"maxmin/concurrency_limit"}, + "Maximum number of concurrent variables in the maxmim system. Also limits the number of " + "processes on each host, at higher level. (default: -1 means no such limitation)"); /* The parameters of network models */ sg_latency_factor = 13.01; // comes from the default LV08 network model - simgrid::config::bindFlag(sg_latency_factor, "network/latency-factor", {"network/latency_factor"}, - "Correction factor to apply to the provided latency (default value set by network model)"); + simgrid::config::bind_flag(sg_latency_factor, "network/latency-factor", {"network/latency_factor"}, + "Correction factor to apply to the provided latency (default value set by network model)"); sg_bandwidth_factor = 0.97; // comes from the default LV08 network model - simgrid::config::bindFlag( + simgrid::config::bind_flag( sg_bandwidth_factor, "network/bandwidth-factor", {"network/bandwidth_factor"}, "Correction factor to apply to the provided bandwidth (default value set by network model)"); sg_weight_S_parameter = 20537; // comes from the default LV08 network model - simgrid::config::bindFlag( + simgrid::config::bind_flag( sg_weight_S_parameter, "network/weight-S", {"network/weight_S"}, "Correction factor to apply to the weight of competing streams (default value set by network model)"); /* Inclusion path */ - simgrid::config::declareFlag("path", "Lookup path for inclusions in platform and deployment XML files", - "", [](std::string const& path) { - if (not path.empty()) - surf_path.push_back(path); - }); - - simgrid::config::declareFlag("cpu/maxmin-selective-update", "Update the constraint set propagating recursively " - "to others constraints (off by default unless " - "optim is set to lazy)", - "no"); + simgrid::config::declare_flag("path", "Lookup path for inclusions in platform and deployment XML files", + "", [](std::string const& path) { + if (not path.empty()) + surf_path.push_back(path); + }); + + simgrid::config::declare_flag("cpu/maxmin-selective-update", + "Update the constraint set propagating recursively to others constraints " + "(off by default unless optim is set to lazy)", + "no"); simgrid::config::alias("cpu/maxmin-selective-update", {"cpu/maxmin_selective_update"}); - simgrid::config::declareFlag("network/maxmin-selective-update", "Update the constraint set propagating " - "recursively to others constraints (off by " - "default unless optim is set to lazy)", - "no"); + simgrid::config::declare_flag("network/maxmin-selective-update", "Update the constraint set propagating " + "recursively to others constraints (off by " + "default unless optim is set to lazy)", + "no"); simgrid::config::alias("network/maxmin-selective-update", {"network/maxmin_selective_update"}); extern bool _sg_do_verbose_exit; - simgrid::config::bindFlag(_sg_do_verbose_exit, "verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C"); + simgrid::config::bind_flag(_sg_do_verbose_exit, "verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C"); - simgrid::config::declareFlag("contexts/stack-size", "Stack size of contexts in KiB", 8 * 1024, - [](int value) { smx_context_stack_size = value * 1024; }); + simgrid::config::declare_flag("contexts/stack-size", "Stack size of contexts in KiB (not with threads)", + 8 * 1024, [](int value) { smx_context_stack_size = value * 1024; }); simgrid::config::alias("contexts/stack-size", {"contexts/stack_size"}); /* guard size for contexts stacks in memory pages */ @@ -307,87 +312,88 @@ void sg_config_init(int *argc, char **argv) #else int default_guard_size = 1; #endif - simgrid::config::declareFlag("contexts/guard-size", "Guard size for contexts stacks in memory pages", - default_guard_size, - [](int value) { smx_context_guard_size = value * xbt_pagesize; }); + simgrid::config::declare_flag("contexts/guard-size", "Guard size for contexts stacks in memory pages", + default_guard_size, + [](int value) { smx_context_guard_size = value * xbt_pagesize; }); simgrid::config::alias("contexts/guard-size", {"contexts/guard_size"}); - simgrid::config::declareFlag("contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, - &SIMIX_context_set_nthreads); + simgrid::config::declare_flag("contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, + &SIMIX_context_set_nthreads); - simgrid::config::declareFlag("contexts/parallel-threshold", - "Minimal number of user contexts to be run in parallel (raw contexts only)", 2, - &SIMIX_context_set_parallel_threshold); + simgrid::config::declare_flag("contexts/parallel-threshold", + "Minimal number of user contexts to be run in parallel (raw contexts only)", 2, + &SIMIX_context_set_parallel_threshold); simgrid::config::alias("contexts/parallel-threshold", {"contexts/parallel_threshold"}); /* synchronization mode for parallel user contexts */ #if HAVE_FUTEX_H std::string default_synchro_mode = "futex"; -#else //No futex on mac and posix is unimplememted yet +#else // No futex on mac and posix is unimplemented yet std::string default_synchro_mode = "busy_wait"; #endif - simgrid::config::declareFlag("contexts/synchro", "Synchronization mode to use when running contexts in " - "parallel (either futex, posix or busy_wait)", - default_synchro_mode, &_sg_cfg_cb_contexts_parallel_mode); + simgrid::config::declare_flag("contexts/synchro", "Synchronization mode to use when running contexts in " + "parallel (either futex, posix or busy_wait)", + default_synchro_mode, &_sg_cfg_cb_contexts_parallel_mode); // For smpi/bw-factor and smpi/lat-factor // SMPI model can be used without enable_smpi, so keep this out of the ifdef. - simgrid::config::declareFlag("smpi/bw-factor", - "Bandwidth factors for smpi. Format: " - "'threshold0:value0;threshold1:value1;...;thresholdN:valueN', " - "meaning if(size >=thresholdN ) return valueN.", - "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"); + simgrid::config::declare_flag("smpi/bw-factor", + "Bandwidth factors for smpi. Format: " + "'threshold0:value0;threshold1:value1;...;thresholdN:valueN', " + "meaning if(size >=thresholdN ) return valueN.", + "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"); simgrid::config::alias("smpi/bw-factor", {"smpi/bw_factor"}); - simgrid::config::declareFlag("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"); + simgrid::config::declare_flag("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"); simgrid::config::alias("smpi/lat-factor", {"smpi/lat_factor"}); - simgrid::config::declareFlag("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"); + simgrid::config::declare_flag("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"); simgrid::config::alias("smpi/IB-penalty-factors", {"smpi/IB_penalty_factors"}); #if HAVE_SMPI - simgrid::config::declareFlag("smpi/host-speed", "Speed of the host running the simulation (in flop/s). " - "Used to bench the operations.", - 20000.0); + simgrid::config::declare_flag("smpi/host-speed", "Speed of the host running the simulation (in flop/s). " + "Used to bench the operations.", + 20000.0); simgrid::config::alias("smpi/host-speed", {"smpi/running_power", "smpi/running-power"}); - simgrid::config::declareFlag("smpi/keep-temps", "Whether we should keep the generated temporary files.", false); + simgrid::config::declare_flag("smpi/keep-temps", "Whether we should keep the generated temporary files.", + false); - simgrid::config::declareFlag("smpi/display-timing", "Whether we should display the timing after simulation.", - false); + simgrid::config::declare_flag("smpi/display-timing", "Whether we should display the timing after simulation.", + false); simgrid::config::alias("smpi/display-timing", {"smpi/display_timing"}); - simgrid::config::declareFlag("smpi/simulate-computation", - "Whether the computational part of the simulated application should be simulated.", - true); + simgrid::config::declare_flag( + "smpi/simulate-computation", "Whether the computational part of the simulated application should be simulated.", + true); simgrid::config::alias("smpi/simulate-computation", {"smpi/simulate_computation"}); - simgrid::config::declareFlag( + simgrid::config::declare_flag( "smpi/shared-malloc", "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes.", "global"); simgrid::config::alias("smpi/shared-malloc", {"smpi/use_shared_malloc", "smpi/use-shared-malloc"}); - simgrid::config::declareFlag("smpi/shared-malloc-blocksize", - "Size of the bogus file which will be created for global shared allocations", - 1UL << 20); - simgrid::config::declareFlag("smpi/shared-malloc-hugepage", - "Path to a mounted hugetlbfs, to use huge pages with shared malloc.", ""); + simgrid::config::declare_flag("smpi/shared-malloc-blocksize", + "Size of the bogus file which will be created for global shared allocations", + 1UL << 20); + simgrid::config::declare_flag("smpi/shared-malloc-hugepage", + "Path to a mounted hugetlbfs, to use huge pages with shared malloc.", ""); - simgrid::config::declareFlag( + simgrid::config::declare_flag( "smpi/cpu-threshold", "Minimal computation time (in seconds) not discarded, or -1 for infinity.", 1e-6); simgrid::config::alias("smpi/cpu-threshold", {"smpi/cpu_threshold"}); - simgrid::config::declareFlag( + simgrid::config::declare_flag( "smpi/async-small-thresh", "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver", 0); simgrid::config::alias("smpi/async-small-thresh", {"smpi/async_small_thres", "smpi/async_small_thresh"}); - simgrid::config::declareFlag("smpi/trace-call-location", - "Should filename and linenumber of MPI calls be traced?", false); + simgrid::config::declare_flag("smpi/trace-call-location", + "Should filename and linenumber of MPI calls be traced?", false); - simgrid::config::declareFlag( + simgrid::config::declare_flag( "smpi/send-is-detached-thresh", "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend", 65536); simgrid::config::alias("smpi/send-is-detached-thresh", @@ -397,68 +403,65 @@ void sg_config_init(int *argc, char **argv) if (default_privatization == nullptr) default_privatization = "no"; - simgrid::config::declareFlag( + simgrid::config::declare_flag( "smpi/privatization", "How we should privatize global variable at runtime (no, yes, mmap, dlopen).", default_privatization); simgrid::config::alias("smpi/privatization", {"smpi/privatize_global_variables", "smpi/privatize-global-variables"}); - simgrid::config::declareFlag("smpi/grow-injected-times", - "Whether we want to make the injected time in MPI_Iprobe and MPI_Test grow, to " - "allow faster simulation. This can make simulation less precise, though.", - true); + simgrid::config::declare_flag( + "smpi/privatize-libs", "Add libraries (; separated) to privatize (libgfortran for example). You need to provide the full names of the files (libgfortran.so.4), or its full path", ""); + + simgrid::config::declare_flag("smpi/grow-injected-times", + "Whether we want to make the injected time in MPI_Iprobe and MPI_Test grow, to " + "allow faster simulation. This can make simulation less precise, though.", + true); #if HAVE_PAPI - simgrid::config::declareFlag("smpi/papi-events", - "This switch enables tracking the specified counters with PAPI", ""); + simgrid::config::declare_flag("smpi/papi-events", + "This switch enables tracking the specified counters with PAPI", ""); #endif - simgrid::config::declareFlag("smpi/comp-adjustment-file", - "A file containing speedups or slowdowns for some parts of the code.", ""); - simgrid::config::declareFlag( + simgrid::config::declare_flag("smpi/comp-adjustment-file", + "A file containing speedups or slowdowns for some parts of the code.", ""); + simgrid::config::declare_flag( "smpi/os", "Small messages timings (MPI_Send minimum time for small messages)", "0:0:0:0:0"); - simgrid::config::declareFlag( + simgrid::config::declare_flag( "smpi/ois", "Small messages timings (MPI_Isend minimum time for small messages)", "0:0:0:0:0"); - simgrid::config::declareFlag( + simgrid::config::declare_flag( "smpi/or", "Small messages timings (MPI_Recv minimum time for small messages)", "0:0:0:0:0"); - simgrid::config::declareFlag("smpi/iprobe-cpu-usage", - "Maximum usage of CPUs by MPI_Iprobe() calls. We've observed that MPI_Iprobes " - "consume significantly less power than the maximum of a specific application. " - "This value is then (Iprobe_Usage/Max_Application_Usage).", - 1.0); + simgrid::config::declare_flag("smpi/iprobe-cpu-usage", + "Maximum usage of CPUs by MPI_Iprobe() calls. We've observed that MPI_Iprobes " + "consume significantly less power than the maximum of a specific application. " + "This value is then (Iprobe_Usage/Max_Application_Usage).", + 1.0); - simgrid::config::declareFlag("smpi/coll-selector", "Which collective selector to use", "default"); + simgrid::config::declare_flag("smpi/coll-selector", "Which collective selector to use", "default"); simgrid::config::alias("smpi/coll-selector", {"smpi/coll_selector"}); - simgrid::config::declareFlag("smpi/gather", "Which collective to use for gather", ""); - simgrid::config::declareFlag("smpi/allgather", "Which collective to use for allgather", ""); - simgrid::config::declareFlag("smpi/barrier", "Which collective to use for barrier", ""); - simgrid::config::declareFlag("smpi/reduce_scatter", "Which collective to use for reduce_scatter", ""); + simgrid::config::declare_flag("smpi/gather", "Which collective to use for gather", ""); + simgrid::config::declare_flag("smpi/allgather", "Which collective to use for allgather", ""); + simgrid::config::declare_flag("smpi/barrier", "Which collective to use for barrier", ""); + simgrid::config::declare_flag("smpi/reduce_scatter", "Which collective to use for reduce_scatter", ""); simgrid::config::alias("smpi/reduce_scatter", {"smpi/reduce-scatter"}); - simgrid::config::declareFlag("smpi/scatter", "Which collective to use for scatter", ""); - simgrid::config::declareFlag("smpi/allgatherv", "Which collective to use for allgatherv", ""); - simgrid::config::declareFlag("smpi/allreduce", "Which collective to use for allreduce", ""); - simgrid::config::declareFlag("smpi/alltoall", "Which collective to use for alltoall", ""); - simgrid::config::declareFlag("smpi/alltoallv", "Which collective to use for alltoallv", ""); - simgrid::config::declareFlag("smpi/bcast", "Which collective to use for bcast", ""); - simgrid::config::declareFlag("smpi/reduce", "Which collective to use for reduce", ""); + simgrid::config::declare_flag("smpi/scatter", "Which collective to use for scatter", ""); + simgrid::config::declare_flag("smpi/allgatherv", "Which collective to use for allgatherv", ""); + simgrid::config::declare_flag("smpi/allreduce", "Which collective to use for allreduce", ""); + simgrid::config::declare_flag("smpi/alltoall", "Which collective to use for alltoall", ""); + simgrid::config::declare_flag("smpi/alltoallv", "Which collective to use for alltoallv", ""); + simgrid::config::declare_flag("smpi/bcast", "Which collective to use for bcast", ""); + simgrid::config::declare_flag("smpi/reduce", "Which collective to use for reduce", ""); #endif // HAVE_SMPI - /* 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 */ - simgrid::config::declareFlag( + simgrid::config::declare_flag( "exception/cutpath", "Whether to cut all path information from call traces, used e.g. in exceptions.", false); extern bool _sg_do_clean_atexit; - simgrid::config::bindFlag(_sg_do_clean_atexit, "clean-atexit", {"clean_atexit"}, - "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end."); + simgrid::config::bind_flag(_sg_do_clean_atexit, "clean-atexit", {"clean_atexit"}, + "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end."); if (surf_path.empty()) - xbt_cfg_setdefault_string("path", "./"); + simgrid::config::set_default("path", "./"); _sg_cfg_init_status = 1; @@ -469,9 +472,6 @@ void sg_config_init(int *argc, char **argv) void sg_config_finalize() { - if (not _sg_cfg_init_status) - return; /* Not initialized yet. Nothing to do */ - - xbt_cfg_free(&simgrid_config); + simgrid::config::finalize(); _sg_cfg_init_status = 0; }