#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
-#include "xbt/log.h"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route);
explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
NetPoint* gw_src;
NetPoint* gw_dst;
- std::vector<surf::LinkImpl*> links;
+ std::vector<resource::LinkImpl*> links;
};
-NetZoneImpl::NetZoneImpl(NetZone* father, std::string name) : NetZone(father, name)
+NetZoneImpl::NetZoneImpl(NetZoneImpl* father, std::string name) : piface_(this), father_(father), name_(name)
{
- xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name.c_str()),
+ xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name.c_str()),
"Refusing to create a second NetZone called '%s'.", name.c_str());
- netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast<NetZoneImpl*>(father));
+ netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, father);
XBT_DEBUG("NetZone '%s' created with the id '%u'", name.c_str(), netpoint_->id());
}
NetZoneImpl::~NetZoneImpl()
{
+ for (auto const& nz : children_)
+ delete nz;
+
for (auto const& kv : bypass_routes_)
delete kv.second;
- simgrid::s4u::Engine::getInstance()->netpointUnregister(netpoint_);
+ simgrid::s4u::Engine::get_instance()->netpoint_unregister(netpoint_);
+}
+const char* NetZoneImpl::get_cname() const
+{
+ return name_.c_str();
+}
+NetZoneImpl* NetZoneImpl::get_father()
+{
+ return father_;
+}
+void NetZoneImpl::seal()
+{
+ sealed_ = true;
+}
+/** @brief Returns the list of direct children (no grand-children)
+ *
+ * This returns the internal data, no copy. Don't mess with it.
+ */
+std::vector<NetZoneImpl*>* NetZoneImpl::get_children()
+{
+ return &children_;
+}
+/** @brief Returns the list of the hosts found in this NetZone (not recursively)
+ *
+ * Only the hosts that are directly contained in this NetZone are retrieved,
+ * not the ones contained in sub-netzones.
+ */
+std::vector<s4u::Host*> NetZoneImpl::get_all_hosts()
+{
+ std::vector<s4u::Host*> res;
+ for (auto const& card : get_vertices()) {
+ s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->get_name());
+ if (host != nullptr)
+ res.push_back(host);
+ }
+ return res;
+}
+int NetZoneImpl::get_host_count()
+{
+ int count = 0;
+ for (auto const& card : get_vertices()) {
+ s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->get_name());
+ if (host != nullptr)
+ count++;
+ }
+ return count;
}
simgrid::s4u::Host* NetZoneImpl::create_host(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
res->pimpl_netpoint = new NetPoint(name, NetPoint::Type::Host, this);
- surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
+ surf_cpu_model_pm->create_cpu(res, speedPerPstate, coreAmount);
if (props != nullptr)
for (auto const& kv : *props)
- res->setProperty(kv.first, kv.second);
+ res->set_property(kv.first, kv.second);
- simgrid::s4u::Host::onCreation(*res); // notify the signal
+ simgrid::s4u::Host::on_creation(*res); // notify the signal
return res;
}
+int NetZoneImpl::add_component(kernel::routing::NetPoint* elm)
+{
+ vertices_.push_back(elm);
+ return vertices_.size() - 1; // The rank of the newly created object
+}
+void NetZoneImpl::add_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*/)
+{
+ xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_.c_str());
+}
+
void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical)
+ std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
{
/* Argument validity checks */
if (gw_dst) {
NetZoneImpl* current = src->get_englobing_zone();
while (current != nullptr) {
path_src.push_back(current);
- current = static_cast<NetZoneImpl*>(current->getFather());
+ current = static_cast<NetZoneImpl*>(current->get_father());
}
std::vector<NetZoneImpl*> path_dst;
current = dst->get_englobing_zone();
while (current != nullptr) {
path_dst.push_back(current);
- current = static_cast<NetZoneImpl*>(current->getFather());
+ current = static_cast<NetZoneImpl*>(current->get_father());
}
/* (3) find the common father.
/* PRECONDITION: this is the common ancestor of src and dst */
bool NetZoneImpl::get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst,
- /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency)
+ /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency)
{
// If never set a bypass route return nullptr without any further computations
if (bypass_routes_.empty())
if (dst->get_englobing_zone() == this && src->get_englobing_zone() == this) {
if (bypass_routes_.find({src, dst}) != bypass_routes_.end()) {
BypassRoute* bypassedRoute = bypass_routes_.at({src, dst});
- for (surf::LinkImpl* const& link : bypassedRoute->links) {
+ for (resource::LinkImpl* const& link : bypassedRoute->links) {
links.push_back(link);
if (latency)
- *latency += link->latency();
+ *latency += link->get_latency();
}
XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links", src->get_cname(), dst->get_cname(),
bypassedRoute->links.size());
/* (1) find the path to the root routing component */
std::vector<NetZoneImpl*> path_src;
- NetZone* current = src->get_englobing_zone();
+ NetZoneImpl* current = src->get_englobing_zone();
while (current != nullptr) {
path_src.push_back(static_cast<NetZoneImpl*>(current));
current = current->father_;
src->get_cname(), dst->get_cname(), bypassedRoute->links.size());
if (src != key.first)
get_global_route(src, bypassedRoute->gw_src, links, latency);
- for (surf::LinkImpl* const& link : bypassedRoute->links) {
+ for (resource::LinkImpl* const& link : bypassedRoute->links) {
links.push_back(link);
if (latency)
- *latency += link->latency();
+ *latency += link->get_latency();
}
if (dst != key.second)
get_global_route(bypassedRoute->gw_dst, dst, links, latency);
return false;
}
-void NetZoneImpl::get_global_route(routing::NetPoint* src, routing::NetPoint* dst,
- /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency)
+void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst,
+ /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency)
{
RouteCreationArgs route;
/* If src and dst are in the same netzone, life is good */
if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */
route.link_list = std::move(links);
- common_ancestor->getLocalRoute(src, dst, &route, latency);
+ common_ancestor->get_local_route(src, dst, &route, latency);
links = std::move(route.link_list);
return;
}
/* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */
- common_ancestor->getLocalRoute(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency);
+ common_ancestor->get_local_route(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency);
xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"",
src->get_cname(), dst->get_cname());
