Remove surf_network_model from host_clm03.

surf_solve concentrates all the next_occurring_event calls.
Get network_model from zone of source host in communications

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index bb784a0..de2d979 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -4,6 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/surf/host_clm03.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/sg_config.hpp"
 #include "surf/surf.hpp"
 
@@ -34,20 +35,9 @@ HostCLM03Model::HostCLM03Model()
 
 double HostCLM03Model::next_occurring_event(double now)
 {
-  double min_by_cpu = surf_cpu_model_pm->next_occurring_event(now);
-  double min_by_net =
-      surf_network_model->next_occurring_event_is_idempotent() ? surf_network_model->next_occurring_event(now) : -1;
-  double min_by_dsk = surf_disk_model->next_occurring_event(now);
-
-  XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_dsk %f", this, typeid(surf_cpu_model_pm).name(),
-            min_by_cpu, typeid(surf_network_model).name(), min_by_net, typeid(surf_disk_model).name(), min_by_dsk);
-
-  double res = min_by_cpu;
-  if (res < 0 || (min_by_net >= 0.0 && min_by_net < res))
-    res = min_by_net;
-  if (res < 0 || (min_by_dsk >= 0.0 && min_by_dsk < res))
-    res = min_by_dsk;
-  return res;
+  /* nothing specific to be done here
+   * surf_solve already calls all the models next_occuring_event properly */
+  return -1.0;
 }
 
 void HostCLM03Model::update_actions_state(double /*now*/, double /*delta*/)
@@ -68,10 +58,14 @@ kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vector<s4u
                                                            double rate)
 {
   kernel::resource::Action* action = nullptr;
+  /* FIXME[donassolo]: getting the network_model from the origin host
+   * Soon we need to change this function to first get the routes and later
+   * create the respective surf actions */
+  auto* net_model = host_list[0]->get_netpoint()->get_englobing_zone()->get_network_model();
   if ((host_list.size() == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) {
     action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]);
   } else if ((host_list.size() == 1) && (has_cost(flops_amount, 0) <= 0)) {
-    action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate);
+    action = net_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate);
   } else if ((host_list.size() == 2) && (has_cost(flops_amount, 0) <= 0) && (has_cost(flops_amount, 1) <= 0)) {
     int nb       = 0;
     double value = 0.0;
@@ -83,7 +77,7 @@ kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vector<s4u
       }
     }
     if (nb == 1) {
-      action = surf_network_model->communicate(host_list[0], host_list[1], value, rate);
+      action = net_model->communicate(host_list[0], host_list[1], value, rate);
     } else if (nb == 0) {
       xbt_die("Cannot have a communication with no flop to exchange in this model. You should consider using the "
               "ptask model");

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 2067e62..728cdd0 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -51,6 +51,9 @@ void surf_presolve()
 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;
@@ -74,11 +77,17 @@ double surf_solve(double max_date)
   /* Physical models MUST be resolved first */
   XBT_DEBUG("Looking for next event in physical models");
   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);
 
+  // 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], 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);
 
   XBT_DEBUG("Min for resources (remember that NS3 don't update that value): %f", time_delta);