X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f6a14a19174c4a63f68a219be678bcdb8f85707..479eed15b29c7f0ae552932aec832e80b2f2bb0c:/src/surf/host_clm03.cpp diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index 18b646e096..5fc159498c 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -1,56 +1,39 @@ -/* Copyright (c) 2013-2019. 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. */ -#include "src/surf/host_clm03.hpp" +#include +#include +#include + #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("network/crosstraffic", true); - 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("network/crosstraffic", true); + auto host_model = std::make_shared("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() -{ - 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(); -} + simgrid_cpu_models().init_from_flag_value(); + simgrid_disk_models().init_from_flag_value(); + simgrid_network_models().init_from_flag_value(); + }); -namespace simgrid { -namespace surf { -HostCLM03Model::HostCLM03Model() -{ - all_existing_models.push_back(this); -} +namespace simgrid::kernel::resource { -double HostCLM03Model::next_occurring_event(double now) +double HostCLM03Model::next_occurring_event(double /*now*/) { - double min_by_cpu = surf_cpu_model_pm->next_occurring_event(now); - double min_by_net = - surf_network_model->next_occurring_event_is_idempotent() ? surf_network_model->next_occurring_event(now) : -1; - double min_by_sto = surf_storage_model->next_occurring_event(now); - double min_by_dsk = surf_disk_model->next_occurring_event(now); - - XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f, %s min_by_dsk %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, typeid(surf_disk_model).name(), min_by_dsk); - - double res = min_by_cpu; - if (res < 0 || (min_by_net >= 0.0 && min_by_net < res)) - res = min_by_net; - if (res < 0 || (min_by_sto >= 0.0 && min_by_sto < res)) - res = min_by_sto; - if (res < 0 || (min_by_dsk >= 0.0 && min_by_dsk < res)) - res = min_by_dsk; - return res; + /* nothing specific to be done here + * EngineImpl::solve already calls all the models next_occurring_event properly */ + return -1.0; } void HostCLM03Model::update_actions_state(double /*now*/, double /*delta*/) @@ -66,15 +49,37 @@ static inline double has_cost(const double* array, size_t pos) return -1.0; } -kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vector& host_list, - const double* flops_amount, const double* bytes_amount, - double rate) +Action* HostCLM03Model::io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, + double size) { - kernel::resource::Action* action = nullptr; + 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& 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]->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 = surf_network_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; @@ -86,7 +91,7 @@ kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vectorcommunicate(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"); @@ -104,5 +109,11 @@ kernel::resource::Action* HostCLM03Model::execute_parallel(const std::vectorget_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