X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b0d4aa36f4ef3a0e253b6104b317b5737e075e8..90343fd64afa87283f3be2ab7c6504cc47652f27:/src/simgrid/sg_config.cpp

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 15e6ad35da..bf3dc3b5c0 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"
@@ -115,7 +116,7 @@ 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)
+  if (val==nullptr || val[0] == '\0')
     return;
 
   if (!strcmp(val, "help")) {
@@ -216,42 +217,6 @@ static void _sg_cfg_cb__network_model(const char *name)
   find_model_description(surf_network_model_description, val);
 }
 
-/* callbacks of the network models values */
-static void _sg_cfg_cb__tcp_gamma(const char *name)
-{
-  sg_tcp_gamma = xbt_cfg_get_double(name);
-}
-
-static void _sg_cfg_cb__maxmin_precision(const char* name)
-{
-  sg_maxmin_precision = xbt_cfg_get_double(name);
-}
-
-static void _sg_cfg_cb__surf_precision(const char* name)
-{
-  sg_surf_precision = xbt_cfg_get_double(name);
-}
-
-static void _sg_cfg_cb__sender_gap(const char* name)
-{
-  sg_sender_gap = xbt_cfg_get_double(name);
-}
-
-static void _sg_cfg_cb__latency_factor(const char *name)
-{
-  sg_latency_factor = xbt_cfg_get_double(name);
-}
-
-static void _sg_cfg_cb__bandwidth_factor(const char *name)
-{
-  sg_bandwidth_factor = xbt_cfg_get_double(name);
-}
-
-static void _sg_cfg_cb__weight_S(const char *name)
-{
-  sg_weight_S_parameter = xbt_cfg_get_double(name);
-}
-
 #if HAVE_SMPI
 /* 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,
@@ -307,32 +272,15 @@ static void _check_coll_barrier(const char *name){
   _check_coll("barrier", mpi_coll_barrier_description, name);
 }
 
-static void _sg_cfg_cb__wtime_sleep(const char *name){
-  smpi_wtime_sleep = xbt_cfg_get_double(name);
-}
-
-static void _sg_cfg_cb__iprobe_sleep(const char *name){
-  smpi_iprobe_sleep = xbt_cfg_get_double(name);
-}
-
-static void _sg_cfg_cb__test_sleep(const char *name){
-  smpi_test_sleep = xbt_cfg_get_double(name);
-}
 #endif
 
-/* callback of the inclusion path */
-static void _sg_cfg_cb__surf_path(const char *name)
-{
-  char *path = xbt_strdup(xbt_cfg_get_string(name));
-  if (path[0]) // ignore ""
-    xbt_dynar_push(surf_path, &path);
-}
-
 /* callback to decide if we want to use the model-checking */
 #include "src/xbt_modinter.h"
 
 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
@@ -354,11 +302,6 @@ 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)
-{
-  smx_context_factory_name = xbt_cfg_get_string(name);
-}
-
 static void _sg_cfg_cb_context_stack_size(const char *name)
 {
   smx_context_stack_size_was_set = 1;
@@ -420,76 +363,99 @@ static void _sg_cfg_cb__surf_network_crosstraffic(const char *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,
+  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 += sprintf(p, ", %s", model_description[i].name);
-  sprintf(p, ".\n       (use 'help' as a value to see the long description of each %s)", name);
+    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<result+resultsize-1,"Buffer too small to display the model description of %s",name);
 }
 
 /* create the config set, register what should be and parse the command line*/
 void sg_config_init(int *argc, char **argv)
 {
+  int descsize = 1024;
   char description[1024];
 
   /* Create the configuration support */
   if (_sg_cfg_init_status == 0) { /* Only create stuff if not already inited */
 
     /* Plugins configuration */
-    describe_model(description, surf_plugin_description, "plugin", "The plugins");
+    describe_model(description,descsize, surf_plugin_description, "plugin", "The plugins");
     xbt_cfg_register_string("plugin", nullptr, &_sg_cfg_cb__plugin, description);
 
-    describe_model(description, surf_cpu_model_description, "model", "The model to use for the CPU");
+    describe_model(description,descsize, surf_cpu_model_description, "model", "The model to use for the CPU");
     xbt_cfg_register_string("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, description);
 
-    describe_model(description, surf_optimization_mode_description, "optimization mode", "The optimization modes to use for the CPU");
+    describe_model(description,descsize, surf_optimization_mode_description, "optimization mode", "The optimization modes to use for the CPU");
     xbt_cfg_register_string("cpu/optim", "Lazy", &_sg_cfg_cb__optimization_mode, description);
 
-    describe_model(description, surf_storage_model_description, "model", "The model to use for the storage");
+    describe_model(description,descsize, surf_storage_model_description, "model", "The model to use for the storage");
     xbt_cfg_register_string("storage/model", "default", &_sg_cfg_cb__storage_mode, description);
 
-    describe_model(description, surf_network_model_description, "model", "The model to use for the network");
+    describe_model(description,descsize, surf_network_model_description, "model", "The model to use for the network");
     xbt_cfg_register_string("network/model", "LV08", &_sg_cfg_cb__network_model, description);
 
-    describe_model(description, surf_optimization_mode_description, "optimization mode", "The optimization modes to use for the network");
+    describe_model(description,descsize, surf_optimization_mode_description, "optimization mode", "The optimization modes to use for the network");
     xbt_cfg_register_string("network/optim", "Lazy", &_sg_cfg_cb__optimization_mode, description);
 
-    describe_model(description, surf_host_model_description, "model", "The model to use for the host");
+    describe_model(description,descsize, surf_host_model_description, "model", "The model to use for the host");
     xbt_cfg_register_string("host/model", "default", &_sg_cfg_cb__host_model, description);
 
-    describe_model(description, surf_vm_model_description, "model", "The model to use for the vm");
+    describe_model(description,descsize, surf_vm_model_description, "model", "The model to use for the vm");
     xbt_cfg_register_string("vm/model", "default", &_sg_cfg_cb__vm_model, description);
 
-    xbt_cfg_register_double("network/TCP_gamma",  4194304.0, _sg_cfg_cb__tcp_gamma,
-        "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)");
-    xbt_cfg_register_double("surf/precision", 0.00001, _sg_cfg_cb__surf_precision,
-        "Numerical precision used when updating simulation times (in seconds)");
-    xbt_cfg_register_double("maxmin/precision", 0.00001, _sg_cfg_cb__maxmin_precision,
-        "Numerical precision used when computing resource sharing (in ops/sec or bytes/sec)");
+    simgrid::config::bindFlag(sg_tcp_gamma = 4194304.0,
+      { "network/TCP-gamma", "network/TCP_gamma" },
+      "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)");
+    simgrid::config::bindFlag(sg_surf_precision = 0.00001,
+      "surf/precision",
+      "Numerical precision used when updating simulation times (in seconds)");
+    simgrid::config::bindFlag(sg_maxmin_precision = 0.00001,
+      "maxmin/precision",
+      "Numerical precision used when computing resource sharing (in ops/sec or bytes/sec)");
 
     /* The parameters of network models */
 
-    xbt_cfg_register_double("network/sender_gap", NAN, _sg_cfg_cb__sender_gap,
-        "Minimum gap between two overlapping sends"); /* real default for "network/sender_gap" is set in network_smpi.cpp */
-    xbt_cfg_register_double("network/latency_factor", 1.0, _sg_cfg_cb__latency_factor,
-        "Correction factor to apply to the provided latency (default value set by network model)");
-    xbt_cfg_register_double("network/bandwidth_factor", 1.0, _sg_cfg_cb__bandwidth_factor, "Correction factor to apply to the provided bandwidth (default value set by network model)");
-    xbt_cfg_register_double("network/weight_S", NAN, _sg_cfg_cb__weight_S, /* real default for "network/weight_S" is set in network_*.cpp */
-        "Correction factor to apply to the weight of competing streams (default value set by network model)");
+    // real default for "network/sender-gap" is set in network_smpi.cpp:
+    simgrid::config::bindFlag(sg_sender_gap = NAN,
+      { "network/sender-gap", "network/sender_gap" },
+      "Minimum gap between two overlapping sends");
+    simgrid::config::bindFlag(sg_latency_factor = 1.0,
+      { "network/latency-factor", "network/latency_factor" },
+      "Correction factor to apply to the provided latency (default value set by network model)");
+    simgrid::config::bindFlag(sg_bandwidth_factor = 1.0,
+      { "network/bandwidth-factor", "network/bandwidth_factor" },
+      "Correction factor to apply to the provided bandwidth (default value set by network model)");
+    // real default for "network/weight-S" is set in network_*.cpp:
+    simgrid::config::bindFlag(sg_weight_S_parameter = NAN,
+      { "network/weight-S", "network/weight_S" },
+      "Correction factor to apply to the weight of competing streams (default value set by network model)");
 
     /* Inclusion path */
-    xbt_cfg_register_string("path", "", _sg_cfg_cb__surf_path, "Lookup path for inclusions in platform and deployment XML files");
-
-    xbt_cfg_register_boolean("cpu/maxmin_selective_update", "no", NULL,
+    simgrid::config::declareFlag<std::string>("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, &copy);
+        }
+      });
+
+    xbt_cfg_register_boolean("cpu/maxmin-selective-update", "no", NULL,
         "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)");
-    xbt_cfg_register_boolean("network/maxmin_selective_update", "no", NULL,
+    xbt_cfg_register_alias("cpu/maxmin-selective-update","cpu/maxmin_selective_update");
+    xbt_cfg_register_boolean("network/maxmin-selective-update", "no", NULL,
         "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_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)");
@@ -502,16 +468,18 @@ void sg_config_init(int *argc, char **argv)
         "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", "no", _mc_cfg_cb_sparse_checkpoint, "Use sparse per-page snapshots.");
+    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","", _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,
+    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/send_determinism", "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", "dpor", _mc_cfg_cb_reduce,
@@ -520,41 +488,28 @@ void sg_config_init(int *argc, char **argv)
         "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,
+    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_int("model-check/max_depth", 1000, _mc_cfg_cb_max_depth, "Maximal exploration depth (default: 1000)");
+    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_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", "yes", _sg_cfg_cb_verbose_exit, "Activate the \"do nothing\" mode in Ctrl-C");
 
-    /* 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", dflt_ctx_fact, _sg_cfg_cb_context_factory, description);
-
-    xbt_cfg_register_int("contexts/stack_size", 8*1024, _sg_cfg_cb_context_stack_size, "Stack size of contexts in KiB");
+    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",
+    xbt_cfg_register_int("contexts/guard-size",
 #if defined(_WIN32) || (PTH_STACKGROWTH != -1)
         0,
 #else
@@ -563,11 +518,12 @@ void sg_config_init(int *argc, char **argv)
     _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/parallel_threshold", 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 */
 #if HAVE_FUTEX_H
@@ -584,46 +540,67 @@ void sg_config_init(int *argc, char **argv)
     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)");
 
-#if HAVE_NS3
-    xbt_cfg_register_string("ns3/TcpModel", "default", NULL, "The ns3 tcp model can be : NewReno or Reno or Tahoe");
-#endif
-
     //For smpi/bw_factor and smpi/lat_factor
     // SMPI model can be used without enable_smpi, so keep this out of the ifdef.
-    xbt_cfg_register_string("smpi/bw_factor",
+    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", NULL,
         "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",
+    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", NULL, "Latency factors for smpi.");
+    xbt_cfg_register_alias("smpi/lat-factor","smpi/lat_factor");
     
-    xbt_cfg_register_string("smpi/IB_penalty_factors", "0.965;0.925;1.35", NULL,
+    xbt_cfg_register_string("smpi/IB-penalty-factors", "0.965;0.925;1.35", NULL,
         "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", 20000.0, NULL, "Power of the host running the simulation (in flop/s). Used to bench the operations.");
-    xbt_cfg_register_boolean("smpi/display_timing", "no", NULL, "Whether we should display the timing after simulation.");
-    xbt_cfg_register_boolean("smpi/simulate_computation", "yes", NULL, "Whether the computational part of the simulated application should be simulated.");
-    xbt_cfg_register_boolean("smpi/use_shared_malloc", "yes", NULL, "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes.");
-    xbt_cfg_register_double("smpi/cpu_threshold", 1e-6, NULL, "Minimal computation time (in seconds) not discarded, or -1 for infinity.");
-    xbt_cfg_register_int("smpi/async_small_thresh", 0, NULL,
+    xbt_cfg_register_double("smpi/running-power", 20000.0, NULL, "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", NULL, "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", NULL, "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", NULL, "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, NULL, "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, NULL,
         "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver");
-    xbt_cfg_register_int("smpi/send_is_detached_thresh", 65536, NULL,
+    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", NULL, "Should filename and linenumber of MPI calls be traced?");
+
+    xbt_cfg_register_int("smpi/send-is-detached-thresh", 65536, NULL,
         "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", NULL, "Whether we should privatize global variable at runtime.");
+    xbt_cfg_register_alias("smpi/privatize-global-variables", "smpi/privatize_global_variables");
 
-    xbt_cfg_register_boolean("smpi/privatize_global_variables", "no", NULL, "Whether we should privatize global variable at runtime.");
+#if HAVE_PAPI
+    xbt_cfg_register_string("smpi/papi-events", nullptr, NULL, "This switch enables tracking the specified counters with PAPI");
+#endif
+    xbt_cfg_register_string("smpi/comp-adjustment-file", nullptr, NULL, "A file containing speedups or slowdowns for some parts of the code.");
     xbt_cfg_register_string("smpi/os", "1:0:0:0:0", NULL,  "Small messages timings (MPI_Send minimum time for small messages)");
     xbt_cfg_register_string("smpi/ois", "1:0:0:0:0", NULL, "Small messages timings (MPI_Isend minimum time for small messages)");
     xbt_cfg_register_string("smpi/or", "1:0:0:0:0", NULL,  "Small messages timings (MPI_Recv minimum time for small messages)");
-    xbt_cfg_register_double("smpi/iprobe", 1e-4, _sg_cfg_cb__iprobe_sleep, "Minimum time to inject inside a call to MPI_Iprobe");
-    xbt_cfg_register_double("smpi/test", 1e-4, _sg_cfg_cb__test_sleep, "Minimum time to inject inside a call to MPI_Test");
-    xbt_cfg_register_double("smpi/wtime", 0.0, _sg_cfg_cb__wtime_sleep, "Minimum time to inject inside a call to MPI_Wtime");
 
-    xbt_cfg_register_string("smpi/coll_selector", "default", NULL, "Which collective selector to use");
+    xbt_cfg_register_string("smpi/coll-selector", "default", NULL, "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_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");
@@ -636,8 +613,9 @@ void sg_config_init(int *argc, char **argv)
     xbt_cfg_register_boolean("exception/cutpath", "no", NULL,
         "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,
+    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 */