mention disk model in host model descriptions

[simgrid.git] / src / surf / surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 0e08fa8..bfd588a 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -30,7 +30,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke
 simgrid::kernel::profile::FutureEvtSet future_evt_set;
 std::vector<std::string> surf_path;
 
-/* Don't forget to update the option description in smx_config when you change this */
 const std::vector<surf_model_description_t> surf_network_model_description = {
     {"LV08",
      "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; "
@@ -55,10 +54,6 @@ const std::vector<surf_model_description_t> surf_network_model_description = {
 };
 
 #if !HAVE_SMPI
-void surf_network_model_init_SMPI()
-{
-  xbt_die("Please activate SMPI support in cmake to use the SMPI network model.");
-}
 void surf_network_model_init_IB()
 {
   xbt_die("Please activate SMPI support in cmake to use the IB network model.");
@@ -75,15 +70,17 @@ 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)",
+    {"default", "Default host model. Currently, CPU:Cas01, network:LV08 (with cross traffic enabled), and disk:S19",
      &surf_host_model_init_current_default},
-    {"compound", "Host model that is automatically chosen if you change the network and CPU models",
+    {"compound", "Host model that is automatically chosen if you change the CPU, network, and disk models",
      &surf_host_model_init_compound},
-    {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks",
+    {"ptask_L07", "Host model somehow similar to Cas01+CM02+S19 but allowing parallel tasks",
      &surf_host_model_init_ptask_L07},
-    {"ptask_BMF", "Host model which implements BMF resource allocation and allows parallel tasks",
-     &surf_host_model_init_ptask_BMF},
 };
 
 const std::vector<surf_model_description_t> surf_optimization_mode_description = {
@@ -95,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)
 {
@@ -168,9 +161,9 @@ void model_help(const char* category, const std::vector<surf_model_description_t
 const surf_model_description_t* find_model_description(const std::vector<surf_model_description_t>& table,
                                                        const std::string& name)
 {
-  auto pos = std::find_if(table.begin(), table.end(),
-                          [&name](const surf_model_description_t& item) { return item.name == name; });
-  if (pos != table.end())
+  if (auto pos = std::find_if(table.begin(), table.end(),
+                              [&name](const surf_model_description_t& item) { return item.name == name; });
+      pos != table.end())
     return &*pos;
 
   std::string sep;