xbt_assert(nullptr == s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()),
"Refusing to create a second NetZone called '%s'.", get_cname());
- netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone, father);
+ netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone, father_);
XBT_DEBUG("NetZone '%s' created with the id '%u'", get_cname(), netpoint_->id());
}
* 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*> NetZoneImpl::get_all_hosts() const
{
std::vector<s4u::Host*> res;
for (auto const& card : get_vertices()) {
}
return res;
}
-int NetZoneImpl::get_host_count()
+int NetZoneImpl::get_host_count() const
{
int count = 0;
for (auto const& card : get_vertices()) {
return count;
}
+s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
+ s4u::Link::SharingPolicy policy,
+ const std::unordered_map<std::string, std::string>* props)
+{
+ static double last_warned_latency = sg_surf_precision;
+ if (latency != 0.0 && latency < last_warned_latency) {
+ XBT_WARN("Latency for link %s is smaller than surf/precision (%g < %g)."
+ " For more accuracy, consider setting \"--cfg=surf/precision:%g\".",
+ name.c_str(), latency, sg_surf_precision, latency);
+ last_warned_latency = latency;
+ }
+
+ auto* l = surf_network_model->create_link(name, bandwidths, latency, policy);
+
+ if (props)
+ l->set_properties(*props);
+
+ return l->get_iface();
+}
s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector<double>& speed_per_pstate,
- int coreAmount, const std::map<std::string, std::string>* props)
+ int coreAmount, const std::unordered_map<std::string, std::string>* props)
{
- s4u::Host* res = new s4u::Host(name);
+ auto* res = new s4u::Host(name);
if (hierarchy_ == RoutingMode::unset)
hierarchy_ = RoutingMode::base;
}
/* Build a copy that will be stored in the dict */
- BypassRoute* newRoute = new BypassRoute(gw_src, gw_dst);
+ auto* newRoute = new BypassRoute(gw_src, gw_dst);
for (auto const& link : link_list)
newRoute->links.push_back(link);
NetZoneImpl* current = src->get_englobing_zone();
while (current != nullptr) {
path_src.push_back(current);
- current = static_cast<NetZoneImpl*>(current->get_father());
+ current = 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->get_father());
+ current = current->get_father();
}
/* (3) find the common father.
std::vector<NetZoneImpl*> path_src;
NetZoneImpl* current = src->get_englobing_zone();
while (current != nullptr) {
- path_src.push_back(static_cast<NetZoneImpl*>(current));
+ path_src.push_back(current);
current = current->father_;
}
std::vector<NetZoneImpl*> path_dst;
current = dst->get_englobing_zone();
while (current != nullptr) {
- path_dst.push_back(static_cast<NetZoneImpl*>(current));
+ path_dst.push_back(current);
current = current->father_;
}
/* 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);
- xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"",
+ xbt_assert((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 */