X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea10e88fd41a11386d9e3868d72ab8cb933a4292..7672ae43c2b49a7dcdc0976cc89a05cc87ae534c:/src/surf/surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 766f547117..8b46ada8ef 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -54,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.");
@@ -74,13 +70,19 @@ 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},
+    {"sio_S22", "Host model somehow similar to Cas01+CM02+S19 but allowing streaming I/Os",
+     &surf_host_model_init_sio_S22},
 };
 
 const std::vector<surf_model_description_t> surf_optimization_mode_description = {
@@ -92,10 +94,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)
 {
@@ -165,9 +163,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;