-/* Copyright (c) 2006-2021. 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/Exception.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/simix.hpp"
-#include "simgrid/zone.h"
-#include "xbt/parse_units.hpp"
-
-namespace simgrid {
-namespace s4u {
-
-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::LinkImpl*> const& link_list)>
- NetZone::on_route_creation;
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/NetZone.hpp>
+#include <simgrid/simix.hpp>
+#include <simgrid/zone.h>
+#include <xbt/parse_units.hpp>
+
+#include "src/kernel/resource/NetworkModel.hpp"
+
+namespace simgrid::s4u {
+
xbt::signal<void(NetZone const&)> NetZone::on_creation;
xbt::signal<void(NetZone const&)> NetZone::on_seal;
void NetZone::set_property(const std::string& key, const std::string& value)
{
- kernel::actor::simcall([this, &key, &value] { pimpl_->set_property(key, value); });
+ kernel::actor::simcall_answered([this, &key, &value] { pimpl_->set_property(key, value); });
}
/** @brief Returns the list of direct children (no grand-children) */
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;
}
-NetZone* NetZone::add_child(NetZone* new_zone)
-{
- new_zone->set_parent(this);
- return this;
-}
-
const std::string& NetZone::get_name() const
{
return pimpl_->get_name();
return pimpl_->get_cname();
}
-NetZone* NetZone::get_father()
-{
- return pimpl_->get_parent()->get_iface();
-}
-
NetZone* NetZone::get_parent() const
{
return pimpl_->get_parent()->get_iface();
NetZone* NetZone::set_parent(const NetZone* parent)
{
- kernel::actor::simcall([this, parent] { pimpl_->set_parent(parent->get_impl()); });
+ kernel::actor::simcall_answered([this, parent] { pimpl_->set_parent(parent->get_impl()); });
return this;
}
return pimpl_->get_all_hosts();
}
-int NetZone::get_host_count() const
+size_t NetZone::get_host_count() const
{
return pimpl_->get_host_count();
}
-int NetZone::add_component(kernel::routing::NetPoint* elm)
+unsigned long NetZone::add_component(kernel::routing::NetPoint* elm)
{
return pimpl_->add_component(elm);
}
-std::vector<kernel::resource::LinkImpl*> NetZone::get_link_list_impl(const std::vector<Link*> link_list)
+void NetZone::add_route(const NetZone* src, const NetZone* dst, const std::vector<const Link*>& links)
{
- std::vector<kernel::resource::LinkImpl*> links;
- for (const auto& link : link_list) {
- links.push_back(link->get_impl());
+ 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));
}
- return links;
+ 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(dst ? dst->get_netpoint(): nullptr, src ? src->get_netpoint() : nullptr,
+ dst ? dst->get_gateway() : nullptr, src ? src->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<Link*>& 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, NetZone::get_link_list_impl(link_list), symmetrical);
+ 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<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+ const std::vector<const Link*>& links) // XBT_ATTRIB_DEPRECATED_v339
{
- pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+ 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,
- std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+ const std::vector<LinkInRoute>& link_list)
{
- pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+ pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list);
}
void NetZone::extract_xbt_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
NetZone* NetZone::seal()
{
- kernel::actor::simcall([this] { pimpl_->seal(); });
+ 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)
+{
+ return create_host(name, std::vector<double>{speed});
+}
s4u::Host* NetZone::create_host(const std::string& name, const std::vector<double>& speed_per_pstate)
{
- return kernel::actor::simcall(
+ return kernel::actor::simcall_answered(
[this, &name, &speed_per_pstate] { return pimpl_->create_host(name, speed_per_pstate); });
}
+
+s4u::Host* NetZone::create_host(const std::string& name, const std::string& speed)
+{
+ return create_host(name, std::vector<std::string>{speed});
+}
+
s4u::Host* NetZone::create_host(const std::string& name, const std::vector<std::string>& speed_per_pstate)
{
return create_host(name, Host::convert_pstate_speed_vector(speed_per_pstate));
}
+s4u::Link* NetZone::create_link(const std::string& name, double bandwidth)
+{
+ return create_link(name, std::vector<double>{bandwidth});
+}
+
s4u::Link* NetZone::create_link(const std::string& name, const std::vector<double>& bandwidths)
{
- return kernel::actor::simcall([this, &name, &bandwidths] { return pimpl_->create_link(name, bandwidths); });
+ return kernel::actor::simcall_answered([this, &name, &bandwidths] { return pimpl_->create_link(name, bandwidths); });
+}
+
+s4u::Link* NetZone::create_link(const std::string& name, const std::string& bandwidth)
+{
+ return create_link(name, std::vector<std::string>{bandwidth});
+}
+
+s4u::SplitDuplexLink* NetZone::create_split_duplex_link(const std::string& name, const std::string& bandwidth)
+{
+ double speed;
+ try {
+ speed = xbt_parse_get_bandwidth("", 0, bandwidth, "");
+ } catch (const simgrid::ParseError&) {
+ throw std::invalid_argument("Impossible to create split-duplex link: " + name +
+ ". Invalid bandwidth: " + bandwidth);
+ }
+ return create_split_duplex_link(name, speed);
+}
+
+s4u::SplitDuplexLink* NetZone::create_split_duplex_link(const std::string& name, double bandwidth)
+{
+ return kernel::actor::simcall_answered(
+ [this, &name, &bandwidth] { return pimpl_->create_split_duplex_link(name, std::vector<double>{bandwidth}); });
}
s4u::Link* NetZone::create_link(const std::string& name, const std::vector<std::string>& bandwidths)
bw.reserve(bandwidths.size());
for (const auto& speed_str : bandwidths) {
try {
- double speed = xbt_parse_get_bandwidth("", 0, speed_str.c_str(), nullptr, "");
+ 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);
}
-} // namespace s4u
-} // namespace simgrid
+kernel::routing::NetPoint* NetZone::create_router(const std::string& name)
+{
+ return kernel::actor::simcall_answered([this, &name] { return pimpl_->create_router(name); });
+}
+
+kernel::routing::NetPoint* NetZone::get_netpoint() const
+{
+ return pimpl_->get_netpoint();
+}
+
+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
+{
+ return pimpl_->get_network_model().get();
+}
+} // namespace simgrid::s4u
/* **************************** Public C interface *************************** */
