Implement a new algorithm for SMPI_SHARED_MALLOC: global

[simgrid.git] / src / simgrid / sg_config.cpp

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 621ca12..d961fbc 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -384,17 +384,16 @@ void sg_config_init(int *argc, char **argv)
     simgrid::config::bindFlag(sg_tcp_gamma, { "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)");
 
-    sg_surf_precision = 0.00001;
     simgrid::config::bindFlag(sg_surf_precision, "surf/precision",
       "Numerical precision used when updating simulation times (in seconds)");
 
-    sg_maxmin_precision = 0.00001;
     simgrid::config::bindFlag(sg_maxmin_precision, "maxmin/precision",
-      "Numerical precision used when computing resource sharing (in ops/sec or bytes/sec)");
+                              "Numerical precision used when computing resource sharing (in flops/sec or bytes/sec)");
 
-    sg_concurrency_limit = 100;
-    simgrid::config::bindFlag(sg_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");
+    simgrid::config::bindFlag(sg_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)");
+    xbt_cfg_register_alias("maxmin/concurrency-limit", "maxmin/concurrency_limit");
 
     /* The parameters of network models */
 
@@ -540,8 +539,10 @@ void sg_config_init(int *argc, char **argv)
     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_string("smpi/shared-malloc", "global", nullptr,
+                            "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes.");
+    xbt_cfg_register_alias("smpi/shared-malloc", "smpi/use-shared-malloc");
+    xbt_cfg_register_alias("smpi/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");