Move Simcall from namespace simix to kernel::actor.

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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 21c9623761cc944c9d51a90fc1f8e0d75ac12b38..55b8cf49ab5ac52d535c4f7ad99d58aa74e18be8 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -16,7 +16,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host);
 void surf_host_model_init_current_default()
 {
   simgrid::config::set_default<bool>("network/crosstraffic", true);
-  auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>("Host_CLM03");
+  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);
@@ -26,18 +26,20 @@ void surf_host_model_init_current_default()
 
 void surf_host_model_init_compound()
 {
-  auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>("Host_CLM03");
+  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 {
-double HostCLM03Model::next_occurring_event(double now)
+namespace kernel {
+namespace resource {
+
+double HostCLM03Model::next_occurring_event(double /*now*/)
 {
   /* nothing specific to be done here
-   * surf_solve already calls all the models next_occurring_event properly */
+   * EngineImpl::solve already calls all the models next_occurring_event properly */
   return -1.0;
 }
 
@@ -54,11 +56,10 @@ 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;
+  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]->get_cpu()->execution_start(flops_amount[0], rate);
@@ -93,5 +94,17 @@ kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vector<s4u
   return action;
 }
 
-} // namespace surf
+Action* HostCLM03Model::execute_thread(const s4u::Host* host, double flops_amount, int thread_count)
+{
+  auto cpu = host->get_cpu();
+  /* Create a single action whose cost is thread_count * flops_amount,, that requests thread_count cores and
+   * is bounded to the currently available speed (i.e., under current load) time the minimum  between the
+   * number of thread and the number of cores of the host */
+  return cpu->execution_start(thread_count * flops_amount, thread_count,
+                              cpu->get_speed(1.0) / cpu->get_speed_ratio() *
+                                  std::min(thread_count, cpu->get_core_count()));
+}
+
+} // namespace resource
+} // namespace kernel
 } // namespace simgrid