Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Completely revise the way to deal with Streamed I/Os
[simgrid.git] / src / surf / host_clm03.cpp
index 0a34da9..77cb7cb 100644 (file)
-/* Copyright (c) 2013-2014. 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 "host_clm03.hpp"
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
 
-#include "cpu_cas01.hpp"
-#include "simgrid/sg_config.h"
-#include "vm_interface.hpp"
+#include "simgrid/sg_config.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);
 
-/*************
- * CallBacks *
- *************/
-
-/*********
- * Model *
- *********/
-
-void surf_host_model_init_current_default(void)
+void surf_host_model_init_current_default()
 {
-  surf_host_model = new HostCLM03Model();
-  xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
+  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();
-  surf_host_model->p_cpuModel = surf_cpu_model_pm;
-
-  ModelPtr model = surf_host_model;
-  xbt_dynar_push(model_list, &model);
-  xbt_dynar_push(model_list_invoke, &model);
-  sg_platf_host_add_cb(host_parse_init);
 }
 
 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);
+}
 
-  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 HostCLM03Model();
+namespace simgrid::kernel::resource {
 
-  ModelPtr model = surf_host_model;
-  xbt_dynar_push(model_list, &model);
-  xbt_dynar_push(model_list_invoke, &model);
-  sg_platf_host_add_cb(host_parse_init);
+double HostCLM03Model::next_occurring_event(double /*now*/)
+{
+  /* nothing specific to be done here
+   * EngineImpl::solve already calls all the models next_occurring_event properly */
+  return -1.0;
 }
 
-HostCLM03Model::HostCLM03Model()
- : HostModel("Host CLM03")
+void HostCLM03Model::update_actions_state(double /*now*/, double /*delta*/)
 {
+  /* I've no action to update */
 }
 
-HostCLM03Model::~HostCLM03Model()
-{}
-
-HostPtr HostCLM03Model::createHost(const char *name){
-  sg_host_t sg_host = sg_host_by_name(name);
-  HostPtr host = new HostCLM03(surf_host_model, name, NULL,
-                 (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
-                 sg_host_edge(sg_host),
-                 sg_host_surfcpu(sg_host));
-  XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
-  xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, host);
-  return host;
+/* Helper function for executeParallelTask */
+static inline double has_cost(const double* array, size_t pos)
+{
+  if (array)
+    return array[pos];
+  return -1.0;
 }
 
-double HostCLM03Model::shareResources(double now){
-  adjustWeightOfDummyCpuActions();
-
-  double min_by_cpu = p_cpuModel->shareResources(now);
-  double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;
-  double min_by_sto = -1;
-  if (p_cpuModel == surf_cpu_model_pm)
-       min_by_sto = surf_storage_model->shareResources(now);
-
-  XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
-      this, surf_cpu_model_pm->getName(), min_by_cpu,
-            surf_network_model->getName(), min_by_net,
-            surf_storage_model->getName(), min_by_sto);
-
-  double res = max(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;
-}
+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);
+  }
 
-void HostCLM03Model::updateActionsState(double /*now*/, double /*delta*/){
-  return;
+  return action;
 }
 
-ActionPtr HostCLM03Model::executeParallelTask(int host_nb,
-                                        void **host_list,
-                                        double *flops_amount,
-                                        double *bytes_amount,
-                                        double rate){
-#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
-  ActionPtr action =NULL;
-  if ((host_nb == 1)
-      && (cost_or_zero(bytes_amount, 0) == 0.0)){
-    action = ((HostCLM03Ptr)host_list[0])->execute(flops_amount[0]);
-  } else if ((host_nb == 1)
-           && (cost_or_zero(flops_amount, 0) == 0.0)) {
-    action = communicate((HostCLM03Ptr)host_list[0],
-        (HostCLM03Ptr)host_list[0],bytes_amount[0], rate);
-  } else if ((host_nb == 2)
-             && (cost_or_zero(flops_amount, 0) == 0.0)
-             && (cost_or_zero(flops_amount, 1) == 0.0)) {
-    int i,nb = 0;
+Action* HostCLM03Model::execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
+                                         const double* bytes_amount, double rate)
+{
+  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 (i = 0; i < host_nb * host_nb; i++) {
-      if (cost_or_zero(bytes_amount, i) > 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 = cost_or_zero(bytes_amount, i);
+        value = has_cost(bytes_amount, i);
       }
     }
-    if (nb == 1){
-      action = communicate((HostCLM03Ptr)host_list[0],
-          (HostCLM03Ptr)host_list[1],value, rate);
+    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
-    THROW_UNIMPLEMENTED;      /* This model does not implement parallel tasks */
-#undef cost_or_zero
-  xbt_free((HostCLM03Ptr)host_list);
+  } 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;
 }
 
-ActionPtr HostCLM03Model::communicate(HostPtr src, HostPtr dst, double size, double rate){
-  return surf_network_model->communicate(src->p_netElm, dst->p_netElm, size, rate);
-}
-
-
-
-/************
- * Resource *
- ************/
-HostCLM03::HostCLM03(HostModelPtr model, const char* name, xbt_dict_t properties, xbt_dynar_t storage, RoutingEdgePtr netElm, CpuPtr cpu)
-  : Host(model, name, properties, storage, netElm, cpu) {}
-
-bool HostCLM03::isUsed(){
-  THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
-  return -1;
-}
-
-void HostCLM03::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/){
-  THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
-}
-
-ActionPtr HostCLM03::execute(double size) {
-  return p_cpu->execute(size);
-}
-
-ActionPtr HostCLM03::sleep(double duration) {
-  return p_cpu->sleep(duration);
-}
-
-e_surf_resource_state_t HostCLM03::getState() {
-  return p_cpu->getState();
+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);
 }
 
-/**********
- * Action *
- **********/
+} // namespace simgrid::kernel::resource