rename disk model init function: default is S19

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 0fa1beb..7d00fcf 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -248,7 +248,7 @@ void sg_config_init(int *argc, char **argv)
   declare_model_flag("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, surf_cpu_model_description, "model",
                      "The model to use for the CPU");
 
-  declare_model_flag("disk/model", "default", &_sg_cfg_cb__disk_model, surf_disk_model_description, "model",
+  declare_model_flag("disk/model", "S19", &_sg_cfg_cb__disk_model, surf_disk_model_description, "model",
                      "The model to use for the disk");
 
   declare_model_flag("network/model", "LV08", &_sg_cfg_cb__network_model, surf_network_model_description, "model",

diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp
index a6f894f..b0471f3 100644 (file)
--- a/src/surf/disk_s19.cpp
+++ b/src/surf/disk_s19.cpp
@@ -19,7 +19,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk);
  * Model *
  *********/
 
-void surf_disk_model_init_default()
+void surf_disk_model_init_S19()
 {
   auto disk_model = std::make_shared<simgrid::kernel::resource::DiskS19Model>("Disk");
   auto* engine    = simgrid::kernel::EngineImpl::get_instance();

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 26eecf3..1ba1e2d 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -70,6 +70,10 @@ const std::vector<surf_model_description_t> surf_cpu_model_description = {
     {"Cas01", "Simplistic CPU model (time=size/speed).", &surf_cpu_model_init_Cas01},
 };
 
+const std::vector<surf_model_description_t> surf_disk_model_description = {
+    {"S19", "Simplistic disk model.", &surf_disk_model_init_S19},
+};
+
 const std::vector<surf_model_description_t> surf_host_model_description = {
     {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)",
      &surf_host_model_init_current_default},
@@ -88,10 +92,6 @@ const std::vector<surf_model_description_t> surf_optimization_mode_description =
     {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
 };
 
-const std::vector<surf_model_description_t> surf_disk_model_description = {
-    {"default", "Simplistic disk model.", &surf_disk_model_init_default},
-};
-
 /* returns whether #file_path is an absolute file path. Surprising, isn't it ? */
 static bool is_absolute_file_path(const std::string& file_path)
 {

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 8a6d580..87bee13 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -75,6 +75,9 @@ static inline int double_equals(double value1, double value2, double precision)
  */
 XBT_PUBLIC void surf_cpu_model_init_Cas01();
 
+XBT_ATTRIB_DEPRECATED_v337 ("Please use surf_disk_model_init_S19()") XBT_PUBLIC void surf_disk_model_init_default();
+XBT_PUBLIC void surf_disk_model_init_S19();
+
 /** @ingroup SURF_models
  *  @brief Same as network model 'LagrangeVelho', only with different correction factors.
  *
@@ -176,8 +179,6 @@ XBT_PUBLIC void surf_host_model_init_current_default();
  */
 XBT_PUBLIC void surf_host_model_init_ptask_L07();
 
-XBT_PUBLIC void surf_disk_model_init_default();
-
 /* --------------------
  *  Model Descriptions
  * -------------------- */