get rid of simix_global and smx_private.hpp

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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index afae2cb..5e49c86 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -15,9 +15,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host);
 
 void surf_host_model_init_current_default()
 {
-  auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>();
+  auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>("Host_CLM03");
   simgrid::config::set_default<bool>("network/crosstraffic", true);
-  host_model->set_name("Host_CLM03");
   simgrid::kernel::EngineImpl::get_instance()->add_model(host_model);
   simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
   surf_cpu_model_init_Cas01();
@@ -26,8 +25,7 @@ void surf_host_model_init_current_default()
 
 void surf_host_model_init_compound()
 {
-  auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>();
-  host_model->set_name("Host_CLM03");
+  auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>("Host_CLM03");
   simgrid::kernel::EngineImpl::get_instance()->add_model(host_model);
   simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
 }
@@ -59,12 +57,9 @@ 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]);
+    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)) {