also alias the 3.12 option names

diff --git a/ChangeLog b/ChangeLog
index 1f31314..af1d63e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,11 +2,7 @@ SimGrid (3.13) UNRELEASED; urgency=low
 
  The Easter Trim Release.
 
 
  The Easter Trim Release.
 

- Backwards Compatibility breaks
-   - Some command line options were renamed for consistency sake:
-     - smpi/async_small_thres        -> smpi/async_small_thresh
-     - smpi/send_is_detached_thres   -> smpi/send_is_detached_thresh 
-
+ * Backwards Compatibility breaks

    - Removed Lua simulation bindings (switch to C or Java for that).
      Lua can still be used to describe platforms
    - Removed Java kernel plug-ins.
    - Removed Lua simulation bindings (switch to C or Java for that).
      Lua can still be used to describe platforms
    - Removed Java kernel plug-ins.

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index cb1cdc9..8062d06 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -638,10 +638,12 @@ void sg_config_init(int *argc, char **argv)
     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_alias("smpi/async-small-thresh","smpi/async_small_thresh");
     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_alias("smpi/async-small-thresh","smpi/async_small_thresh");

+    xbt_cfg_register_alias("smpi/async-small-thresh","smpi/async_small_thres");

 
     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_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.");
     xbt_cfg_register_alias("smpi/privatize-global-variables", "smpi/privatize_global_variables");