-/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-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 <simgrid/s4u/Host.hpp>
#include <simgrid/s4u/VirtualMachine.hpp>
-#include "xbt/asserts.hpp"
-#include "src/include/simgrid/sg_config.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/CpuImpl.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
+#include "src/kernel/resource/HostImpl.hpp"
#include "src/kernel/resource/NetworkModel.hpp"
#include "src/kernel/resource/SplitDuplexLinkImpl.hpp"
#include "src/kernel/resource/StandardLinkImpl.hpp"
#include "src/kernel/resource/VirtualMachineImpl.hpp"
-#include "src/surf/HostImpl.hpp"
+#include "src/simgrid/module.hpp"
+#include "src/simgrid/sg_config.hpp"
+#include "xbt/asserts.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing, kernel, "Kernel routing-related information");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_platform, kernel, "Kernel platform-related information");
namespace simgrid::kernel::routing {
-/* Pick the right models for CPU, net and host, and call their model_init_preparse */
-static void surf_config_models_setup()
-{
- std::string host_model_name = simgrid::config::get_value<std::string>("host/model");
- std::string network_model_name = simgrid::config::get_value<std::string>("network/model");
- std::string cpu_model_name = simgrid::config::get_value<std::string>("cpu/model");
- std::string disk_model_name = simgrid::config::get_value<std::string>("disk/model");
-
- /* The compound host model is needed when using non-default net/cpu models */
- if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) &&
- simgrid::config::is_default("host/model")) {
- host_model_name = "compound";
- simgrid::config::set_value("host/model", host_model_name);
- }
-
- XBT_DEBUG("host model: %s", host_model_name.c_str());
- if (host_model_name == "compound") {
- s4u_enforce(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model");
- s4u_enforce(not network_model_name.empty(), "Set a network model to use with the 'compound' host model");
-
- const auto* cpu_model = find_model_description(surf_cpu_model_description, cpu_model_name);
- cpu_model->model_init_preparse();
-
- const auto* network_model = find_model_description(surf_network_model_description, network_model_name);
- network_model->model_init_preparse();
- }
-
- XBT_DEBUG("Call host_model_init");
- const auto* host_model = find_model_description(surf_host_model_description, host_model_name);
- host_model->model_init_preparse();
-
- XBT_DEBUG("Call vm_model_init");
- /* ideally we should get back the pointer to CpuModel from model_init_preparse(), but this
- * requires changing the declaration of surf_cpu_model_description.
- * To be reviewed in the future */
- surf_vm_model_init_HL13(
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get());
-
- XBT_DEBUG("Call disk_model_init");
- const auto* disk_model = find_model_description(surf_disk_model_description, disk_model_name);
- disk_model->model_init_preparse();
-}
-
xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
std::vector<kernel::resource::StandardLinkImpl*> const& link_list)>
{
auto* engine = s4u::Engine::get_instance();
/* workaroud: first netzoneImpl will be the root netzone.
- * Without globals and with current surf_*_model_description init functions, we need
+ * Without globals and with current model description init functions (see module.hpp), we need
* the root netzone to exist when creating the models.
- * This was usually done at sg_platf.cpp, during XML parsing */
+ * This is usually done at sg_platf.cpp, during XML parsing */
if (not engine->get_netzone_root()) {
engine->set_netzone_root(&piface_);
/* root netzone set, initialize models */
simgrid::s4u::Engine::on_platform_creation();
- /* Initialize the surf models. That must be done after we got all config, and before we need the models.
+ /* Initialize the models. That must be done after we got all config, and before we need the models.
* That is, after the last <config> tag, if any, and before the first of cluster|peer|zone|trace|trace_cb
*
* I'm not sure for <trace> and <trace_cb>, there may be a bug here
* (FIXME: check it out by creating a file beginning with one of these tags)
* but cluster and peer come down to zone creations, so putting this verification here is correct.
*/
- surf_config_models_setup();
+ simgrid_host_models().init_from_flag_value();
+ simgrid_vm_model_init_HL13();
}
- s4u_enforce(nullptr == engine->netpoint_by_name_or_null(get_name()),
+ xbt_enforce(nullptr == engine->netpoint_by_name_or_null(get_name()),
"Refusing to create a second NetZone called '%s'.", get_cname());
netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone);
XBT_DEBUG("NetZone '%s' created with the id '%lu'", get_cname(), netpoint_->id());
void NetZoneImpl::add_child(NetZoneImpl* new_zone)
{
- s4u_enforce(not sealed_, "Cannot add a new child to the sealed zone %s", get_cname());
+ xbt_enforce(not sealed_, "Cannot add a new child to the sealed zone %s", get_cname());
/* set the parent behavior */
hierarchy_ = RoutingMode::recursive;
children_.push_back(new_zone);
s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector<double>& speed_per_pstate)
{
- s4u_enforce(cpu_model_pm_,
+ xbt_enforce(cpu_model_pm_,
"Impossible to create host: %s. Invalid CPU model: nullptr. Have you set the parent of this NetZone: %s?",
name.c_str(), get_cname());
- s4u_enforce(not sealed_, "Impossible to create host: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ xbt_enforce(not sealed_, "Impossible to create host: %s. NetZone %s already sealed", name.c_str(), get_cname());
auto* host = (new resource::HostImpl(name))->set_englobing_zone(this);
hosts_[name] = host;
host->get_iface()->set_netpoint((new NetPoint(name, NetPoint::Type::Host))->set_englobing_zone(this));
s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector<double>& bandwidths)
{
- s4u_enforce(
+ xbt_enforce(
network_model_,
"Impossible to create link: %s. Invalid network model: nullptr. Have you set the parent of this NetZone: %s?",
name.c_str(), get_cname());
- s4u_enforce(not sealed_, "Impossible to create link: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ xbt_enforce(not sealed_, "Impossible to create link: %s. NetZone %s already sealed", name.c_str(), get_cname());
links_[name] = do_create_link(name, bandwidths)->set_englobing_zone(this);
return links_[name]->get_iface();
}
s4u::SplitDuplexLink* NetZoneImpl::create_split_duplex_link(const std::string& name,
const std::vector<double>& bandwidths)
{
- s4u_enforce(
+ xbt_enforce(
network_model_,
"Impossible to create link: %s. Invalid network model: nullptr. Have you set the parent of this NetZone: %s?",
name.c_str(), get_cname());
- s4u_enforce(not sealed_, "Impossible to create link: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ xbt_enforce(not sealed_, "Impossible to create link: %s. NetZone %s already sealed", name.c_str(), get_cname());
auto* link_up = create_link(name + "_UP", bandwidths)->get_impl()->set_englobing_zone(this);
auto* link_down = create_link(name + "_DOWN", bandwidths)->get_impl()->set_englobing_zone(this);
s4u::Disk* NetZoneImpl::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)
{
- s4u_enforce(disk_model_,
+ xbt_enforce(disk_model_,
"Impossible to create disk: %s. Invalid disk model: nullptr. Have you set the parent of this NetZone: %s?",
name.c_str(), get_cname());
- s4u_enforce(not sealed_, "Impossible to create disk: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ xbt_enforce(not sealed_, "Impossible to create disk: %s. NetZone %s already sealed", name.c_str(), get_cname());
auto* l = disk_model_->create_disk(name, read_bandwidth, write_bandwidth);
return l->get_iface();
NetPoint* NetZoneImpl::create_router(const std::string& name)
{
- s4u_enforce(nullptr == s4u::Engine::get_instance()->netpoint_by_name_or_null(name),
+ xbt_enforce(nullptr == s4u::Engine::get_instance()->netpoint_by_name_or_null(name),
"Refusing to create a router named '%s': this name already describes a node.", name.c_str());
- s4u_enforce(not sealed_, "Impossible to create router: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ xbt_enforce(not sealed_, "Impossible to create router: %s. NetZone %s already sealed", name.c_str(), get_cname());
return (new NetPoint(name, NetPoint::Type::Router))->set_englobing_zone(this);
}
}
// split-duplex links
const auto* sd_link = dynamic_cast<const s4u::SplitDuplexLink*>(link.get_link());
- s4u_enforce(sd_link,
+ xbt_enforce(sd_link,
"Add_route: cast to SpliDuplexLink impossible. This should not happen, please contact SimGrid team");
resource::StandardLinkImpl* link_impl;
switch (link.get_direction()) {
resource::HostImpl* NetZoneImpl::get_host_by_name_or_null(const std::string& name) const
{
- for (auto const& [_, host] : hosts_) {
- if (host->get_name() == name)
- return host;
- /* keep old behavior where host and VMs were saved together on EngineImpl::hosts_
- * get hosts returns VMs too */
- auto* vm = host->get_vm_by_name_or_null(name);
- if (vm)
- return vm;
- }
+ if (auto host_it = hosts_.find(name); host_it != hosts_.end())
+ return host_it->second;
for (const auto* child : children_) {
- auto* host = child->get_host_by_name_or_null(name);
- if (host)
+ if (auto* host = child->get_host_by_name_or_null(name))
return host;
}
if (gw_dst) {
XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", src->get_cname(), gw_src->get_cname(), dst->get_cname(),
gw_dst->get_cname());
- s4u_enforce(not link_list.empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", src->get_cname(),
+ xbt_enforce(not link_list.empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", src->get_cname(),
gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname());
- s4u_enforce(bypass_routes_.find({src, dst}) == bypass_routes_.end(),
+ xbt_enforce(bypass_routes_.find({src, dst}) == bypass_routes_.end(),
"The bypass route between %s@%s and %s@%s already exists.", src->get_cname(), gw_src->get_cname(),
dst->get_cname(), gw_dst->get_cname());
} else {
XBT_DEBUG("Load bypassRoute from %s to %s", src->get_cname(), dst->get_cname());
- s4u_enforce(not link_list.empty(), "Bypass route between %s and %s cannot be empty.", src->get_cname(),
+ xbt_enforce(not link_list.empty(), "Bypass route between %s and %s cannot be empty.", src->get_cname(),
dst->get_cname());
- s4u_enforce(bypass_routes_.find({src, dst}) == bypass_routes_.end(),
+ xbt_enforce(bypass_routes_.find({src, dst}) == bypass_routes_.end(),
"The bypass route between %s and %s already exists.", src->get_cname(), dst->get_cname());
}
const NetZoneImpl* src_as = src->get_englobing_zone();
const NetZoneImpl* dst_as = dst->get_englobing_zone();
- s4u_enforce(src_as, "Host %s must be in a netzone", src->get_cname());
- s4u_enforce(dst_as, "Host %s must be in a netzone", dst->get_cname());
+ xbt_enforce(src_as, "Host %s must be in a netzone", src->get_cname());
+ xbt_enforce(dst_as, "Host %s must be in a netzone", dst->get_cname());
/* (2) find the path to the root routing component */
std::vector<NetZoneImpl*> path_src;
if (*src_ancestor == *dst_ancestor) { // src is the ancestor of dst, or the contrary
*common_ancestor = *src_ancestor;
} else {
- s4u_enforce(parent != nullptr);
+ xbt_enforce(parent != nullptr);
*common_ancestor = parent;
}
}
return;
/* If src and dst are in the same netzone, life is good */
- if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */
+ if (src_ancestor == dst_ancestor) { /* ROUTING_BASE */
route.link_list_ = std::move(links);
common_ancestor->get_local_route(src, dst, &route, latency);
links = std::move(route.link_list_);
/* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */
common_ancestor->get_local_route(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency);
- s4u_enforce((route.gw_src_ != nullptr) && (route.gw_dst_ != nullptr), "Bad gateways for route from '%s' to '%s'.",
+ xbt_enforce((route.gw_src_ != nullptr) && (route.gw_dst_ != nullptr), "Bad gateways for route from '%s' to '%s'.",
src->get_cname(), dst->get_cname());
/* If source gateway is not our source, we have to recursively find our way up to this point */
{
std::vector<NetPoint*> vertices = get_vertices();
- for (auto const& my_src : vertices) {
- for (auto const& my_dst : vertices) {
+ for (auto const* my_src : vertices) {
+ for (auto const* my_dst : vertices) {
if (my_src == my_dst)
continue;
}
}
+void NetZoneImpl::set_gateway(const std::string& name, NetPoint* router)
+{
+ xbt_enforce(not sealed_, "Impossible to create gateway: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ if (auto gateway_it = gateways_.find(name); gateway_it != gateways_.end())
+ xbt_die("Impossible to create a gateway named %s. It already exists", name.c_str());
+ else
+ gateways_[name] = router;
+}
+
+NetPoint* NetZoneImpl::get_gateway() const
+{
+ xbt_enforce(not gateways_.empty(), "No default gateway has been defined for NetZone '%s'. Try to seal it first", get_cname());
+ xbt_enforce(gateways_.size() < 2, "NetZone '%s' has more than one gateway, please provide a gateway name", get_cname());
+ auto gateway_it = gateways_.find("default");
+ xbt_enforce(gateway_it != gateways_.end(), "NetZone '%s' hasno default gateway, please define one", get_cname());
+ return gateway_it->second;
+}
+
void NetZoneImpl::seal()
{
/* already sealed netzone */
return;
do_seal(); // derived class' specific sealing procedure
+ // for zone with a single host, this host is its own default gateway
+ if (gateways_.empty() && hosts_.size() == 1)
+ gateways_["default"] = hosts_.begin()->second->get_iface()->get_netpoint();
+
/* seals sub-netzones and hosts */
for (auto* host : get_all_hosts()) {
host->seal();
void NetZoneImpl::set_parent(NetZoneImpl* parent)
{
- s4u_enforce(not sealed_, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname());
+ xbt_enforce(not sealed_, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname());
parent_ = parent;
netpoint_->set_englobing_zone(parent_);
if (parent) {
void NetZoneImpl::set_network_model(std::shared_ptr<resource::NetworkModel> netmodel)
{
- s4u_enforce(not sealed_, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname());
+ xbt_enforce(not sealed_, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname());
network_model_ = std::move(netmodel);
}
void NetZoneImpl::set_cpu_vm_model(std::shared_ptr<resource::CpuModel> cpu_model)
{
- s4u_enforce(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname());
+ xbt_enforce(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname());
cpu_model_vm_ = std::move(cpu_model);
}
void NetZoneImpl::set_cpu_pm_model(std::shared_ptr<resource::CpuModel> cpu_model)
{
- s4u_enforce(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname());
+ xbt_enforce(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname());
cpu_model_pm_ = std::move(cpu_model);
}
void NetZoneImpl::set_disk_model(std::shared_ptr<resource::DiskModel> disk_model)
{
- s4u_enforce(not sealed_, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname());
+ xbt_enforce(not sealed_, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname());
disk_model_ = std::move(disk_model);
}
void NetZoneImpl::set_host_model(std::shared_ptr<resource::HostModel> host_model)
{
- s4u_enforce(not sealed_, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname());
+ xbt_enforce(not sealed_, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname());
host_model_ = std::move(host_model);
}
const NetZoneImpl* NetZoneImpl::get_netzone_recursive(const NetPoint* netpoint) const
{
- s4u_enforce(netpoint && netpoint->is_netzone(), "Netpoint %s must be of the type NetZone",
+ xbt_enforce(netpoint && netpoint->is_netzone(), "Netpoint %s must be of the type NetZone",
netpoint ? netpoint->get_cname() : "nullptr");
if (netpoint == netpoint_)