Modify iteration over models in surf_solve

Added a map with the different models initialized to iterate in
surf_solve function.

Extra: clang-format

diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp
index 39a7cc6..48e1175 100644 (file)
--- a/include/simgrid/kernel/resource/Model.hpp
+++ b/include/simgrid/kernel/resource/Model.hpp
@@ -8,6 +8,7 @@
 
 #include <memory>
 #include <simgrid/kernel/resource/Action.hpp>
+#include <unordered_map>
 
 namespace simgrid {
 namespace kernel {
@@ -19,6 +20,15 @@ namespace resource {
  */
 class XBT_PUBLIC Model {
 public:
+  /** @brief Possible model types */
+  enum class Type {
+    HOST,    /**< Host models: see surf_host_model_description for more details */
+    NETWORK, /**< Network models: see surf_network_model_description for more details */
+    CPU,     /**< CPU models: see surf_cpu_model_description for more details */
+    DISK,    /**< Disk models: see surf_disk_model_description for more details */
+    VM       /**< VM model */
+  };
+
   /** @brief Possible update mechanisms */
   enum class UpdateAlgo {
     FULL, /**< Full update mechanism: the remaining time of every action is recomputed at each step */
@@ -144,5 +154,11 @@ private:
  *  @brief List of initialized models
  */
 XBT_PUBLIC_DATA std::vector<simgrid::kernel::resource::Model*> all_existing_models;
+/** @ingroup SURF_models
+ *  @brief Map of initialized models by category
+ */
+XBT_PUBLIC_DATA
+std::unordered_map<simgrid::kernel::resource::Model::Type, std::vector<simgrid::kernel::resource::Model*>>
+    models_by_type;
 
 #endif

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 6de255d..4fde708 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -104,6 +104,7 @@ static void remove_active_activity(kernel::activity::ActivityImpl const& act)
 VMModel::VMModel()
 {
   all_existing_models.push_back(this);
+  models_by_type[simgrid::kernel::resource::Model::Type::VM].push_back(this);
   s4u::Host::on_state_change.connect(host_state_change);
   s4u::Exec::on_start.connect(add_active_exec);
   s4u::Exec::on_completion.connect(remove_active_exec);

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 3d0122e..7841e71 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -61,6 +61,7 @@ namespace resource {
 CpuCas01Model::CpuCas01Model(Model::UpdateAlgo algo) : CpuModel(algo)
 {
   all_existing_models.push_back(this);
+  models_by_type[simgrid::kernel::resource::Model::Type::CPU].push_back(this);
 
   bool select = config::get_value<bool>("cpu/maxmin-selective-update");
 

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 564bbfb..3dca750 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -279,6 +279,7 @@ void CpuTiModel::create_pm_vm_models()
 CpuTiModel::CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL)
 {
   all_existing_models.push_back(this);
+  models_by_type[simgrid::kernel::resource::Model::Type::CPU].push_back(this);
 }
 
 CpuTiModel::~CpuTiModel()

diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp
index 11eb89f..0b12cab 100644 (file)
--- a/src/surf/disk_s19.cpp
+++ b/src/surf/disk_s19.cpp
@@ -29,6 +29,7 @@ namespace resource {
 DiskS19Model::DiskS19Model()
 {
   all_existing_models.push_back(this);
+  models_by_type[simgrid::kernel::resource::Model::Type::DISK].push_back(this);
 }
 
 DiskImpl* DiskS19Model::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 3b4cf2a..bb784a0 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -29,6 +29,7 @@ namespace surf {
 HostCLM03Model::HostCLM03Model()
 {
   all_existing_models.push_back(this);
+  models_by_type[simgrid::kernel::resource::Model::Type::HOST].push_back(this);
 }
 
 double HostCLM03Model::next_occurring_event(double now)

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 54c5b92..aa1a9c0 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -76,6 +76,7 @@ NetworkCm02Model::NetworkCm02Model()
                                                                              : Model::UpdateAlgo::LAZY)
 {
   all_existing_models.push_back(this);
+  models_by_type[simgrid::kernel::resource::Model::Type::NETWORK].push_back(this);
 
   std::string optim = config::get_value<std::string>("network/optim");
   bool select       = config::get_value<bool>("network/maxmin-selective-update");

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 37dc9be..7c07560 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -25,6 +25,7 @@ namespace resource {
 NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL)
 {
   all_existing_models.push_back(this);
+  models_by_type[simgrid::kernel::resource::Model::Type::NETWORK].push_back(this);
 }
 
 LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector<double>& /*bandwidth*/,

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 5bf5dbf..38c3c37 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -293,6 +293,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL)
              "LinkEnergy plugin and ns-3 network models are not compatible. Are you looking for Ecofen, maybe?");
 
   all_existing_models.push_back(this);
+  models_by_type[simgrid::kernel::resource::Model::Type::NETWORK].push_back(this);
 
   NetPointNs3::EXTENSION_ID = routing::NetPoint::extension_create<NetPointNs3>();
 

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 5a82bd1..1c45a5d 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -24,6 +24,7 @@ void surf_host_model_init_ptask_L07()
 
   surf_host_model = new simgrid::surf::HostL07Model();
   all_existing_models.push_back(surf_host_model);
+  models_by_type[simgrid::kernel::resource::Model::Type::HOST].push_back(surf_host_model);
 }
 
 namespace simgrid {

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index c2bab84..a33793b 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -42,6 +42,16 @@ void surf_presolve()
     model->update_actions_state(NOW, 0.0);
 }
 
+static void surf_update_next_event(std::vector<simgrid::kernel::resource::Model*> const& models, double& time_delta)
+{
+  for (auto* model : models) {
+    double next_event = model->next_occurring_event(NOW);
+    if ((time_delta < 0.0 || next_event < time_delta) && next_event >= 0.0) {
+      time_delta = next_event;
+    }
+  }
+}
+
 double surf_solve(double max_date)
 {
   double time_delta                             = -1.0; /* duration */
@@ -57,24 +67,12 @@ double surf_solve(double max_date)
 
   /* Physical models MUST be resolved first */
   XBT_DEBUG("Looking for next event in physical models");
-  double next_event_phy = surf_host_model->next_occurring_event(NOW);
-  if ((time_delta < 0.0 || next_event_phy < time_delta) && next_event_phy >= 0.0) {
-    time_delta = next_event_phy;
-  }
-  if (surf_vm_model != nullptr) {
-    XBT_DEBUG("Looking for next event in virtual models");
-    double next_event_virt = surf_vm_model->next_occurring_event(NOW);
-    if ((time_delta < 0.0 || next_event_virt < time_delta) && next_event_virt >= 0.0)
-      time_delta = next_event_virt;
-  }
+  surf_update_next_event(models_by_type[simgrid::kernel::resource::Model::Type::HOST], time_delta);
+  XBT_DEBUG("Looking for next event in virtual models");
+  surf_update_next_event(models_by_type[simgrid::kernel::resource::Model::Type::VM], time_delta);
 
-  for (auto const& model : all_existing_models) {
-    if (model != surf_host_model && model != surf_vm_model && model != surf_network_model && model != surf_disk_model) {
-      double next_event_model = model->next_occurring_event(NOW);
-      if ((time_delta < 0.0 || next_event_model < time_delta) && next_event_model >= 0.0)
-        time_delta = next_event_model;
-    }
-  }
+  XBT_DEBUG("Looking for next event in CPU models");
+  surf_update_next_event(models_by_type[simgrid::kernel::resource::Model::Type::CPU], time_delta);
 
   XBT_DEBUG("Min for resources (remember that NS3 don't update that value): %f", time_delta);
 

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 4180682..5a9fd87 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -30,6 +30,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke
  *********/
 
 std::vector<simgrid::kernel::resource::Model*> all_existing_models; /* to destroy models correctly */
+std::unordered_map<simgrid::kernel::resource::Model::Type, std::vector<simgrid::kernel::resource::Model*>>
+    models_by_type;
 
 simgrid::kernel::profile::FutureEvtSet future_evt_set;
 std::vector<std::string> surf_path;