-/* Copyright (c) 2013-2021. 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 "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/kernel/routing/NetZoneImpl.hpp"
-#include "simgrid/s4u/Engine.hpp"
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
+
#include "simgrid/sg_config.hpp"
#include "src/kernel/EngineImpl.hpp"
-#include "surf/surf.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
+#include "src/surf/host_clm03.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_host);
-void surf_host_model_init_current_default()
-{
- auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>();
- simgrid::config::set_default<bool>("network/crosstraffic", true);
- simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::HOST, host_model,
- true);
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->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);
+ simgrid_cpu_models().by_name("Cas01").init();
+ simgrid_disk_models().by_name("S19").init();
+ simgrid_network_models().by_name("LV08").init();
+ });
-void surf_host_model_init_compound()
-{
- auto host_model = std::make_shared<simgrid::surf::HostCLM03Model>();
- simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::HOST, host_model,
- true);
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_host_model(host_model);
-}
+SIMGRID_REGISTER_HOST_MODEL(compound,
+ "Host model that is automatically chosen if you change the CPU, network, and disk models",
+ []() {
+ 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::kernel::resource {
-namespace simgrid {
-namespace surf {
-double HostCLM03Model::next_occurring_event(double now)
+double HostCLM03Model::next_occurring_event(double /*now*/)
{
/* nothing specific to be done here
- * surf_solve already calls all the models next_occuring_event properly */
+ * EngineImpl::solve already calls all the models next_occurring_event properly */
return -1.0;
}
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::io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk,
+ double size)
{
- kernel::resource::Action* action = nullptr;
- /* FIXME[donassolo]: getting the network_model from the origin host
- * Soon we need to change this function to first get the routes and later
- * create the respective surf actions */
+ 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)
+{
+ 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 = 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;
}
}
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");
return action;
}
-} // namespace surf
-} // namespace simgrid
+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
