X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/81d7cef8216e2de0c091d47b34c404047fa8f183..479eed15b29c7f0ae552932aec832e80b2f2bb0c:/src/surf/host_clm03.cpp

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 87e1ec3650..5fc159498c 100644
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2023. 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. */
@@ -14,28 +14,20 @@
 
 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::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();
-}
+SIMGRID_REGISTER_HOST_MODEL(
+    default, "Default host model. Currently, CPU:Cas01, network:LV08 (with cross traffic enabled), and disk:S19", []() {
+      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);
 
-void surf_host_model_init_compound()
-{
-  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);
-}
+      simgrid_cpu_models().init_from_flag_value();
+      simgrid_disk_models().init_from_flag_value();
+      simgrid_network_models().init_from_flag_value();
+    });
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 double HostCLM03Model::next_occurring_event(double /*now*/)
 {
@@ -57,6 +49,28 @@ static inline double has_cost(const double* array, size_t pos)
   return -1.0;
 }
 
+Action* HostCLM03Model::io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk,
+                                  double size)
+{
+  auto net_model = src_host->get_englobing_zone()->get_network_model();
+  auto system = net_model->get_maxmin_system();
+  auto* action = net_model->communicate(src_host, dst_host, size, -1, true);
+
+  // We don't want to apply the network model bandwidth factor to the I/O constraints
+  double bw_factor = net_model->get_bandwidth_factor();
+  if (src_disk != nullptr){
+    //FIXME: if the stream starts from a disk, we might not want to pay the network latency
+    system->expand(src_disk->get_constraint(), action->get_variable(), bw_factor);
+    system->expand(src_disk->get_read_constraint(), action->get_variable(), bw_factor);
+  }
+  if (dst_disk != nullptr){
+    system->expand(dst_disk->get_constraint(), action->get_variable(), bw_factor);
+    system->expand(dst_disk->get_write_constraint(), action->get_variable(), bw_factor);
+  }
+
+  return action;
+}
+
 Action* HostCLM03Model::execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                                          const double* bytes_amount, double rate)
 {
@@ -65,7 +79,7 @@ Action* HostCLM03Model::execute_parallel(const std::vector<s4u::Host*>& host_lis
   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);
   } 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);
+    action = net_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate, false);
   } 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;
@@ -77,7 +91,7 @@ Action* HostCLM03Model::execute_parallel(const std::vector<s4u::Host*>& host_lis
       }
     }
     if (nb == 1) {
-      action = net_model->communicate(host_list[0], host_list[1], value, rate);
+      action = net_model->communicate(host_list[0], host_list[1], value, rate, false);
     } 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");
@@ -102,6 +116,4 @@ Action* HostCLM03Model::execute_thread(const s4u::Host* host, double flops_amoun
   return cpu->execution_start(thread_count * flops_amount, thread_count, -1);
 }
 
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource