X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2311587e43b425e0fc6acf2d3de39d6a38ef8a56..3be0396ca83e510e42adc8e3eb12f4befb2f1fff:/src/surf/host_clm03.cpp

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index f25ebdfd7b..77cb7cbc23 100644
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -1,63 +1,132 @@
-/* Copyright (c) 2013-2018. 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. */
 
-#include "src/surf/host_clm03.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/kernel/resource/NetworkModel.hpp"
+#include "src/surf/host_clm03.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host);
 
 void surf_host_model_init_current_default()
 {
-  surf_host_model = 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_disk_model_init_S19();
   surf_network_model_init_LegrandVelho();
 }
 
 void surf_host_model_init_compound()
 {
-  xbt_assert(surf_cpu_model_pm, "No CPU model defined yet!");
-  xbt_assert(surf_network_model, "No network model defined yet!");
-  surf_host_model = 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()
+namespace simgrid::kernel::resource {
+
+double HostCLM03Model::next_occurring_event(double /*now*/)
 {
-  all_existing_models->push_back(this);
+  /* nothing specific to be done here
+   * EngineImpl::solve already calls all the models next_occurring_event properly */
+  return -1.0;
 }
-double HostCLM03Model::next_occuring_event(double now)
+
+void HostCLM03Model::update_actions_state(double /*now*/, double /*delta*/)
 {
-  ignore_empty_vm_in_pm_LMM();
+  /* I've no action to update */
+}
 
-  double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
-  double min_by_net =
-      surf_network_model->next_occuring_event_is_idempotent() ? surf_network_model->next_occuring_event(now) : -1;
-  double min_by_sto = surf_storage_model->next_occuring_event(now);
+/* Helper function for executeParallelTask */
+static inline double has_cost(const double* array, size_t pos)
+{
+  if (array)
+    return array[pos];
+  return -1.0;
+}
 
-  XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
-      this, typeid(surf_cpu_model_pm).name(), min_by_cpu,
-      typeid(surf_network_model).name(), min_by_net,
-      typeid(surf_storage_model).name(), min_by_sto);
+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);
+
+  size_t nb_disks       = 0;
+  if (src_disk != nullptr)
+    nb_disks++;
+  if (dst_disk != nullptr)
+    nb_disks++;
+
+  // 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);
+  }
 
-  double res = std::max({min_by_cpu, min_by_net, min_by_sto});
-  if (min_by_cpu >= 0.0 && min_by_cpu < res)
-    res = min_by_cpu;
-  if (min_by_net >= 0.0 && min_by_net < res)
-    res = min_by_net;
-  if (min_by_sto >= 0.0 && min_by_sto < res)
-    res = min_by_sto;
-  return res;
+  return action;
 }
 
-void HostCLM03Model::update_actions_state(double /*now*/, double /*delta*/)
+Action* HostCLM03Model::execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
+                                         const double* bytes_amount, double rate)
 {
-  /* I've no action to update */
-}
+  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);
+  } 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, 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;
 
+    for (size_t i = 0; i < host_list.size() * host_list.size(); i++) {
+      if (has_cost(bytes_amount, i) > 0.0) {
+        nb++;
+        value = has_cost(bytes_amount, i);
+      }
+    }
+    if (nb == 1) {
+      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");
+    } else {
+      xbt_die("Cannot have a communication that is not a simple point-to-point in this model. You should consider "
+              "using the ptask model");
+    }
+  } else {
+    xbt_die(
+        "This model only accepts one of the following. You should consider using the ptask model for the other cases.\n"
+        " - execution with one host only and no communication\n"
+        " - Self-comms with one host only\n"
+        " - Communications with two hosts and no computation");
+  }
+  return action;
 }
+
+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 and that requests thread_count cores. */
+  return cpu->execution_start(thread_count * flops_amount, thread_count, -1);
 }
+
+} // namespace simgrid::kernel::resource