Merge remote-tracking branch 'upstream/master' into issue95

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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index db3a995..d11eeea 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -3,44 +3,43 @@
 /* This program is free software; you can redistribute it and/or modify it
  * 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/kernel/routing/NetPoint.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
+
 #include "simgrid/sg_config.hpp"
-#include "surf/surf.hpp"
+#include "src/kernel/EngineImpl.hpp"
+#include "src/surf/host_clm03.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host);
 
 void surf_host_model_init_current_default()
 {
-  /* FIXME[donassolo]: this smells bad, but works
-   * (the constructor saves its pointer in all_existing_models and models_by_type :O).
-   * We need a manager for these models */
-  new simgrid::surf::HostCLM03Model();
   simgrid::config::set_default<bool>("network/crosstraffic", true);
+  auto host_model = std::make_shared<simgrid::kernel::resource::HostCLM03Model>("Host_CLM03");
+  auto* engine    = simgrid::kernel::EngineImpl::get_instance();
+  engine->add_model(host_model);
+  engine->get_netzone_root()->set_host_model(host_model);
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
 }
 
 void surf_host_model_init_compound()
 {
-  /* FIXME[donassolo]: this smells bad, but works
-   * (the constructor saves its pointer in all_existing_models and models_by_type :O).
-   * We need a manager for these models */
-  new simgrid::surf::HostCLM03Model();
+  auto host_model = std::make_shared<simgrid::kernel::resource::HostCLM03Model>("Host_CLM03");
+  auto* engine    = simgrid::kernel::EngineImpl::get_instance();
+  engine->add_model(host_model);
+  engine->get_netzone_root()->set_host_model(host_model);
 }
 
 namespace simgrid {
-namespace surf {
-HostCLM03Model::HostCLM03Model()
-{
-  all_existing_models.push_back(this);
-  models_by_type[simgrid::kernel::resource::Model::Type::HOST].push_back(this);
-}
+namespace kernel {
+namespace resource {
 
-double HostCLM03Model::next_occurring_event(double now)
+double HostCLM03Model::next_occurring_event(double /*now*/)
 {
   /* nothing specific to be done here
-   * surf_solve already calls all the models next_occuring_event properly */
+   * EngineImpl::solve already calls all the models next_occurring_event properly */
   return -1.0;
 }
 
@@ -57,17 +56,13 @@ static inline double has_cost(const double* array, size_t pos)
   return -1.0;
 }
 
-kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vector<s4u::Host*>& host_list,
-                                                           const double* flops_amount, const double* bytes_amount,
-                                                           double rate)
+Action* HostCLM03Model::execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
+                                         const double* bytes_amount, 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();
+  Action* action = nullptr;
+  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]);
+    action = host_list[0]->get_cpu()->execution_start(flops_amount[0], rate);
   } else if ((host_list.size() == 1) && (has_cost(flops_amount, 0) <= 0)) {
     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)) {
@@ -99,5 +94,6 @@ kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vector<s4u
   return action;
 }
 
-} // namespace surf
+} // namespace resource
+} // namespace kernel
 } // namespace simgrid