Get rid of surf_cpu_model_vm.

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

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index c2bab84..a47a841 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -42,6 +42,25 @@ void surf_presolve()
     model->update_actions_state(NOW, 0.0);
 }
 
+/**
+ * @brief Auxiliary function to get next event from a list of models
+ *
+ * @param models list of models to explore (cpu, host, vm) (IN)
+ * @param time_delta delta for the next event (IN/OUT)
+ */
+static void surf_update_next_event(std::vector<simgrid::kernel::resource::Model*> const& models, double& time_delta)
+{
+  for (auto* model : models) {
+    if (not model->next_occurring_event_is_idempotent()) {
+      continue;
+    }
+    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 +76,19 @@ 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);
 
-  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;
-    }
-  }
+  // following the order it was done in HostCLM03Model->next_occurring_event
+  XBT_DEBUG("Looking for next event in CPU models");
+  surf_update_next_event(models_by_type[simgrid::kernel::resource::Model::Type::CPU_PM], time_delta);
+  XBT_DEBUG("Looking for next event in network models");
+  surf_update_next_event(models_by_type[simgrid::kernel::resource::Model::Type::NETWORK], time_delta);
+  XBT_DEBUG("Looking for next event in disk models");
+  surf_update_next_event(models_by_type[simgrid::kernel::resource::Model::Type::DISK], 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);
+  surf_update_next_event(models_by_type[simgrid::kernel::resource::Model::Type::CPU_VM], time_delta);
 
   XBT_DEBUG("Min for resources (remember that NS3 don't update that value): %f", time_delta);
 
@@ -84,7 +98,11 @@ double surf_solve(double max_date)
     double next_event_date = simgrid::kernel::profile::future_evt_set.next_date();
     XBT_DEBUG("Next TRACE event: %f", next_event_date);
 
-    if (not surf_network_model->next_occurring_event_is_idempotent()) { // NS3, I see you
+    for (auto* model : models_by_type[simgrid::kernel::resource::Model::Type::NETWORK]) {
+      if (model->next_occurring_event_is_idempotent())
+        continue;
+
+      // NS3, I see you
       if (next_event_date != -1.0) {
         time_delta = std::min(next_event_date - NOW, time_delta);
       } else {
@@ -93,7 +111,7 @@ double surf_solve(double max_date)
 
       XBT_DEBUG("Run the NS3 network at most %fs", time_delta);
       // run until min or next flow
-      double model_next_action_end = surf_network_model->next_occurring_event(time_delta);
+      double model_next_action_end = model->next_occurring_event(time_delta);
 
       XBT_DEBUG("Min for network : %f", model_next_action_end);
       if (model_next_action_end >= 0.0)