-/* 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. */
std::vector<NetZone*> NetZone::get_children() const
{
std::vector<NetZone*> res;
- for (auto child : pimpl_->get_children())
+ for (auto* child : pimpl_->get_children())
res.push_back(child->get_iface());
return res;
}
return pimpl_->add_component(elm);
}
+void NetZone::add_route(const NetZone* src, const NetZone* dst, const std::vector<const Link*>& links)
+{
+ std::vector<LinkInRoute> links_direct;
+ std::vector<LinkInRoute> links_reverse;
+ for (auto* l : links) {
+ links_direct.emplace_back(LinkInRoute(l, LinkInRoute::Direction::UP));
+ links_reverse.emplace_back(LinkInRoute(l, LinkInRoute::Direction::DOWN));
+ }
+ pimpl_->add_route(src ? src->get_netpoint() : nullptr, dst ? dst->get_netpoint(): nullptr,
+ src ? src->get_gateway() : nullptr, dst ? dst->get_gateway() : nullptr,
+ links_direct, false);
+ pimpl_->add_route(src ? src->get_netpoint() : nullptr, dst ? dst->get_netpoint(): nullptr,
+ src ? src->get_gateway() : nullptr, dst ? dst->get_gateway() : nullptr,
+ links_reverse, false);
+}
+
+void NetZone::add_route(const NetZone* src, const NetZone* dst, const std::vector<LinkInRoute>& link_list, bool symmetrical)
+{
+ pimpl_->add_route(src ? src->get_netpoint() : nullptr, dst ? dst->get_netpoint(): nullptr,
+ src ? src->get_gateway() : nullptr, dst ? dst->get_gateway() : nullptr,
+ link_list, symmetrical);
+}
+
void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- const std::vector<LinkInRoute>& link_list, bool symmetrical)
+ const std::vector<LinkInRoute>& link_list, bool symmetrical) //XBT_ATTRIB_DEPRECATED_v339
{
pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
+void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+ kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+ const std::vector<const Link*>& links) //XBT_ATTRIB_DEPRECATED_v339
+{
+ std::vector<LinkInRoute> links_direct;
+ std::vector<LinkInRoute> links_reverse;
+ for (auto* l : links) {
+ links_direct.emplace_back(LinkInRoute(l, LinkInRoute::Direction::UP));
+ links_reverse.emplace_back(LinkInRoute(l, LinkInRoute::Direction::DOWN));
+ }
+ pimpl_->add_route(src, dst, gw_src, gw_dst, links_direct, false);
+ pimpl_->add_route(dst, src, gw_dst, gw_src, links_reverse, false);
+}
+
+void NetZone::add_route(const Host* src, const Host* dst, const std::vector<LinkInRoute>& link_list, bool symmetrical)
+{
+ pimpl_->add_route(src ? src->get_netpoint(): nullptr, dst ? dst->get_netpoint(): nullptr, nullptr, nullptr,
+ link_list, symmetrical);
+
+}
+
+void NetZone::add_route(const Host* src, const Host* dst, const std::vector<const Link*>& links)
+{
+ std::vector<LinkInRoute> links_direct;
+ std::vector<LinkInRoute> links_reverse;
+ for (auto* l : links) {
+ links_direct.emplace_back(LinkInRoute(l, LinkInRoute::Direction::UP));
+ links_reverse.emplace_back(LinkInRoute(l, LinkInRoute::Direction::DOWN));
+ }
+ pimpl_->add_route(src ? src->get_netpoint(): nullptr, dst ? dst->get_netpoint(): nullptr, nullptr, nullptr,
+ links_direct, false);
+ pimpl_->add_route(dst ? dst->get_netpoint(): nullptr, src ? src->get_netpoint(): nullptr, nullptr, nullptr,
+ links_reverse, false);
+}
+
void NetZone::add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
const std::vector<LinkInRoute>& link_list)
kernel::actor::simcall_answered([this] { pimpl_->seal(); });
return this;
}
+void NetZone::set_latency_factor_cb(
+ std::function<double(double size, const s4u::Host* src, const s4u::Host* dst,
+ const std::vector<s4u::Link*>& /*links*/,
+ const std::unordered_set<s4u::NetZone*>& /*netzones*/)> const& cb) const
+{
+ kernel::actor::simcall_answered([this, &cb]() { pimpl_->get_network_model()->set_lat_factor_cb(cb); });
+}
+void NetZone::set_bandwidth_factor_cb(
+ std::function<double(double size, const s4u::Host* src, const s4u::Host* dst,
+ const std::vector<s4u::Link*>& /*links*/,
+ const std::unordered_set<s4u::NetZone*>& /*netzones*/)> const& cb) const
+{
+ kernel::actor::simcall_answered([this, &cb]() { pimpl_->get_network_model()->set_bw_factor_cb(cb); });
+}
s4u::Host* NetZone::create_host(const std::string& name, double speed)
{
try {
speed = xbt_parse_get_bandwidth("", 0, bandwidth, "");
} catch (const simgrid::ParseError&) {
- throw std::invalid_argument(std::string("Impossible to create split-duplex link: ") + name +
- std::string(". Invalid bandwidth: ") + bandwidth);
+ throw std::invalid_argument("Impossible to create split-duplex link: " + name +
+ ". Invalid bandwidth: " + bandwidth);
}
return create_split_duplex_link(name, speed);
}
double speed = xbt_parse_get_bandwidth("", 0, speed_str, "");
bw.push_back(speed);
} catch (const simgrid::ParseError&) {
- throw std::invalid_argument(std::string("Impossible to create link: ") + name +
- std::string(". Invalid bandwidth: ") + speed_str);
+ throw std::invalid_argument("Impossible to create link: " + name + ". Invalid bandwidth: " + speed_str);
}
}
return create_link(name, bw);
return kernel::actor::simcall_answered([this, &name] { return pimpl_->create_router(name); });
}
-kernel::routing::NetPoint* NetZone::get_netpoint()
+kernel::routing::NetPoint* NetZone::get_netpoint() const
{
return pimpl_->get_netpoint();
}
-kernel::resource::NetworkModelIntf* NetZone::get_network_model() const
+kernel::routing::NetPoint* NetZone::get_gateway() const
+{
+ return pimpl_->get_gateway();
+}
+
+kernel::routing::NetPoint* NetZone::get_gateway(const std::string& name) const
+{
+ return pimpl_->get_gateway(name);
+}
+
+void NetZone::set_gateway(kernel::routing::NetPoint* router)
+{
+ set_gateway("default", router);
+}
+
+void NetZone::set_gateway(const std::string& name, kernel::routing::NetPoint* router)
+{
+ kernel::actor::simcall_answered([this, name, router] { pimpl_->set_gateway(name, router); });
+}
+
+kernel::resource::NetworkModel* NetZone::get_network_model() const
{
- kernel::resource::NetworkModelIntf* model = pimpl_->get_network_model().get();
- return model;
+ return pimpl_->get_network_model().get();
}
} // namespace simgrid::s4u