} // namespace kernel
} // namespace simgrid
-static int surf_parse_models_setup_already_called = 0;
-
-/** The current AS in the parsing */
+/** The current NetZone in the parsing */
static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
static simgrid::kernel::routing::NetZoneImpl* routing_get_current()
{
}
/** Module management function: frees all internal data structures */
-void sg_platf_exit() {
+void sg_platf_exit()
+{
simgrid::kernel::routing::on_cluster_creation.disconnect_slots();
simgrid::s4u::Engine::on_platform_created.disconnect_slots();
- /* make sure that we will reinit the models while loading the platf once reinited */
- surf_parse_models_setup_already_called = 0;
surf_parse_lex_destroy();
}
-/** @brief Add a host to the current AS */
+/** @brief Add a host to the current NetZone */
void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args)
{
- simgrid::s4u::Host* host = routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount);
+ simgrid::s4u::Host* host =
+ routing_get_current()->create_host(args->id, args->speed_per_pstate)->set_core_count(args->core_amount);
if (args->properties) {
host->set_properties(*args->properties);
delete args->properties;
}
- host->pimpl_->set_disks(args->disks, host);
+ host->get_impl()->set_disks(args->disks, host);
/* Change from the defaults */
- if (args->state_trace)
- host->set_state_profile(args->state_trace);
- if (args->speed_trace)
- host->set_speed_profile(args->speed_trace);
- if (args->pstate != 0)
- host->set_pstate(args->pstate);
+ host->set_state_profile(args->state_trace)->set_speed_profile(args->speed_trace);
+
if (not args->coord.empty())
new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord);
+ host->seal();
simgrid::s4u::Host::on_creation(*host); // notify the signal
+
+ /* When energy plugin is activated, changing the pstate requires to already have the HostEnergy extension whose
+ * allocation is triggered by the on_creation signal. Then set_pstate must be called after the signal emition */
+ if (args->pstate != 0)
+ host->set_pstate(args->pstate);
}
/** @brief Add a "router" to the network element list */
xbt_assert(nullptr == simgrid::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());
- auto* netpoint =
- new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
+ auto* netpoint = new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router);
+ netpoint->set_englobing_zone(current_routing);
XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id());
if (coords && strcmp(coords, ""))
new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
-
return netpoint;
}
static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args, const std::string& link_name)
{
- simgrid::s4u::Link* link = routing_get_current()->create_link(link_name, args->bandwidths, args->latency, args->policy);
-
+ simgrid::s4u::Link* link = routing_get_current()->create_link(link_name, args->bandwidths, args->policy);
if (args->properties)
link->set_properties(*args->properties);
- simgrid::kernel::resource::LinkImpl* l = link->get_impl();
- if (args->latency_trace)
- l->set_latency_profile(args->latency_trace);
- if (args->bandwidth_trace)
- l->set_bandwidth_profile(args->bandwidth_trace);
- if (args->state_trace)
- l->set_state_profile(args->state_trace);
+ link->get_impl() // this call to get_impl saves some simcalls but can be removed
+ ->set_state_profile(args->state_trace)
+ ->set_latency_profile(args->latency_trace)
+ ->set_bandwidth_profile(args->bandwidth_trace)
+ ->set_latency(args->latency)
+ ->seal();
}
void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link)
using simgrid::kernel::routing::FatTreeZone;
using simgrid::kernel::routing::TorusZone;
- int rankId=0;
+ int rankId = 0;
- // What an inventive way of initializing the AS that I have as ancestor :-(
+ // What an inventive way of initializing the NetZone that I have as ancestor :-(
simgrid::kernel::routing::ZoneCreationArgs zone;
zone.id = cluster->id;
switch (cluster->topology) {
break;
}
sg_platf_new_Zone_begin(&zone);
- auto* current_as = static_cast<ClusterZone*>(routing_get_current());
- current_as->parse_specific_arguments(cluster);
+ auto* current_zone = static_cast<ClusterZone*>(routing_get_current());
+ current_zone->parse_specific_arguments(cluster);
if (cluster->properties != nullptr)
for (auto const& elm : *cluster->properties)
- current_as->get_iface()->set_property(elm.first, elm.second);
+ current_zone->get_iface()->set_property(elm.first, elm.second);
- if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
- current_as->num_links_per_node_++;
- current_as->has_loopback_ = true;
+ if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) {
+ current_zone->set_loopback();
}
- if(cluster->limiter_link > 0){
- current_as->num_links_per_node_++;
- current_as->has_limiter_ = true;
+ if (cluster->limiter_link > 0) {
+ current_zone->set_limiter();
}
for (int const& i : *cluster->radicals) {
}
host.speed_per_pstate = cluster->speeds;
- host.pstate = 0;
- host.core_amount = cluster->core_amount;
- host.coord = "";
+ host.pstate = 0;
+ host.core_amount = cluster->core_amount;
+ host.coord = "";
sg_platf_new_host(&host);
XBT_DEBUG("</host>");
// the second column may store a limiter link if p_has_limiter is set
// other columns are to store one or more link for the node
- //add a loopback link
+ // add a loopback link
const simgrid::s4u::Link* linkUp = nullptr;
const simgrid::s4u::Link* linkDown = nullptr;
- if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
+ if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) {
std::string tmp_link = link_id + "_loopback";
XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link.c_str(), cluster->loopback_bw);
simgrid::kernel::routing::LinkCreationArgs link;
- link.id = tmp_link;
+ link.id = tmp_link;
link.bandwidths.push_back(cluster->loopback_bw);
- link.latency = cluster->loopback_lat;
- link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
+ link.latency = cluster->loopback_lat;
+ link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
sg_platf_new_link(&link);
linkUp = simgrid::s4u::Link::by_name_or_null(tmp_link);
linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link);
- ClusterZone* as_cluster = current_as;
- as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp->get_impl(), linkDown->get_impl()}});
+ current_zone->add_private_link_at(current_zone->node_pos(rankId), {linkUp->get_impl(), linkDown->get_impl()});
}
- //add a limiter link (shared link to account for maximal bandwidth of the node)
+ // add a limiter link (shared link to account for maximal bandwidth of the node)
linkUp = nullptr;
linkDown = nullptr;
- if(cluster->limiter_link > 0){
+ if (cluster->limiter_link > 0) {
std::string tmp_link = std::string(link_id) + "_limiter";
XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", tmp_link.c_str(), cluster->limiter_link);
simgrid::kernel::routing::LinkCreationArgs link;
- link.id = tmp_link;
+ link.id = tmp_link;
link.bandwidths.push_back(cluster->limiter_link);
link.latency = 0;
- link.policy = simgrid::s4u::Link::SharingPolicy::SHARED;
+ link.policy = simgrid::s4u::Link::SharingPolicy::SHARED;
sg_platf_new_link(&link);
linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link);
linkUp = linkDown;
- current_as->private_links_.insert(
- {current_as->node_pos_with_loopback(rankId), {linkUp->get_impl(), linkDown->get_impl()}});
+ current_zone->add_private_link_at(current_zone->node_pos_with_loopback(rankId),
+ {linkUp->get_impl(), linkDown->get_impl()});
}
- //call the cluster function that adds the others links
+ // call the cluster function that adds the others links
if (cluster->topology == simgrid::kernel::routing::ClusterTopology::FAT_TREE) {
- static_cast<FatTreeZone*>(current_as)->add_processing_node(i);
+ static_cast<FatTreeZone*>(current_zone)->add_processing_node(i);
} else {
- current_as->create_links_for_node(cluster, i, rankId, current_as->node_pos_with_loopback_limiter(rankId));
+ current_zone->create_links_for_node(cluster, i, rankId, current_zone->node_pos_with_loopback_limiter(rankId));
}
rankId++;
}
XBT_DEBUG("<router id=\"%s\"/>", cluster->router_id.c_str());
if (cluster->router_id.empty())
cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix;
- current_as->router_ = sg_platf_new_router(cluster->router_id, nullptr);
+ current_zone->set_router(sg_platf_new_router(cluster->router_id, nullptr));
- //Make the backbone
+ // Make the backbone
if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) {
simgrid::kernel::routing::LinkCreationArgs link;
- link.id = std::string(cluster->id)+ "_backbone";
+ link.id = std::string(cluster->id) + "_backbone";
link.bandwidths.push_back(cluster->bb_bw);
- link.latency = cluster->bb_lat;
- link.policy = cluster->bb_sharing_policy;
+ link.latency = cluster->bb_lat;
+ link.policy = cluster->bb_sharing_policy;
XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link.id.c_str(), cluster->bb_bw, cluster->bb_lat);
sg_platf_new_link(&link);
routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl());
}
- XBT_DEBUG("</AS>");
+ XBT_DEBUG("</zone>");
sg_platf_new_Zone_seal();
simgrid::kernel::routing::on_cluster_creation(*cluster);
auto* cluster = dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing);
xbt_assert(cluster, "Only hosts from Cluster can get a backbone.");
- xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->get_cname());
+ xbt_assert(not cluster->has_backbone(), "Cluster %s already has a backbone link!", cluster->get_cname());
- cluster->backbone_ = bb;
- XBT_DEBUG("Add a backbone to AS '%s'", current_routing->get_cname());
+ cluster->set_backbone(bb);
+ XBT_DEBUG("Add a backbone to zone '%s'", current_routing->get_cname());
}
void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet)
for (int const& radical : *cabinet->radicals) {
std::string hostname = cabinet->prefix + std::to_string(radical) + cabinet->suffix;
simgrid::kernel::routing::HostCreationArgs host;
- host.pstate = 0;
- host.core_amount = 1;
- host.id = hostname;
+ host.pstate = 0;
+ host.core_amount = 1;
+ host.id = hostname;
host.speed_per_pstate.push_back(cabinet->speed);
sg_platf_new_host(&host);
simgrid::kernel::routing::LinkCreationArgs link;
- link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
- link.latency = cabinet->lat;
+ link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
+ link.latency = cabinet->lat;
link.bandwidths.push_back(cabinet->bw);
- link.id = "link_" + hostname;
+ link.id = "link_" + hostname;
sg_platf_new_link(&link);
simgrid::kernel::routing::HostLinkCreationArgs host_link;
simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk)
{
- simgrid::kernel::lmm::System* maxmin_system = surf_disk_model->get_maxmin_system();
- simgrid::kernel::resource::DiskImpl* pimpl = surf_disk_model->create_disk();
+ simgrid::kernel::resource::DiskImpl* pimpl =
+ routing_get_current()->create_disk(disk->id, disk->read_bw, disk->write_bw)->get_impl();
- // This should be done using s4u::Disk methods and passed to the pimpl
- pimpl->set_read_bandwidth(disk->read_bw)
- ->set_write_bandwidth(disk->write_bw)
- ->set_name(disk->id);
if (disk->properties) {
pimpl->set_properties(*disk->properties);
delete disk->properties;
}
- // This should be done in the seal() of a Disk creation
- pimpl->set_read_constraint(maxmin_system->constraint_new(pimpl,disk->read_bw))
- ->set_write_constraint(maxmin_system->constraint_new(pimpl, disk->write_bw))
- ->set_model(surf_disk_model)
- ->set_constraint(maxmin_system->constraint_new(pimpl, std::max(disk->read_bw, disk->write_bw)));
-
- XBT_DEBUG("Create resource with read_bw '%f' write_bw '%f'", disk->read_bw, disk->write_bw);
- pimpl->turn_on();
-
- // Temporary hack
- pimpl->get_iface()->set_name(disk->id);
+ pimpl->seal();
simgrid::s4u::Disk::on_creation(*pimpl->get_iface());
return pimpl;
}
double kill_time = actor->kill_time;
bool auto_restart = actor->restart_on_failure;
- std::string actor_name = actor->args[0];
+ std::string actor_name = actor->args[0];
simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args));
std::shared_ptr<std::unordered_map<std::string, std::string>> properties(actor->properties);
auto* arg =
new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart);
- host->pimpl_->add_actor_at_boot(arg);
+ host->get_impl()->add_actor_at_boot(arg);
if (start_time > SIMIX_get_clock()) {
arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart);
new_actor->set_auto_restart(auto_restart);
delete arg;
});
- } else { // start_time <= SIMIX_get_clock()
+ } else { // start_time <= SIMIX_get_clock()
XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname());
try {
void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer)
{
- auto* as = dynamic_cast<simgrid::kernel::routing::VivaldiZone*>(current_routing);
- xbt_assert(
as, "<peer> tag can only be used in Vivaldi netzones.");
+ auto* zone = dynamic_cast<simgrid::kernel::routing::VivaldiZone*>(current_routing);
+ xbt_assert(
zone, "<peer> tag can only be used in Vivaldi netzones.");
std::vector<double> speed_per_pstate;
speed_per_pstate.push_back(peer->speed);
- simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1);
+ simgrid::s4u::Host* host = zone->create_host(peer->id, speed_per_pstate);
- as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord);
+ zone->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord);
/* Change from the defaults */
if (peer->state_trace)
host->set_state_profile(peer->state_trace);
if (peer->speed_trace)
host->set_speed_profile(peer->speed_trace);
+ host->seal();
simgrid::s4u::Host::on_creation(*host); // notify the signal
}
-/* Pick the right models for CPU, net and host, and call their model_init_preparse */
-static void surf_config_models_setup()
+/**
+ * @brief Auxiliary function to build the object NetZoneImpl
+ *
+ * Builds the objects, setting its father properties and root netzone if needed
+ * @param zone the parameters defining the Zone to build.
+ * @return Pointer to recently created netzone
+ */
+static simgrid::kernel::routing::NetZoneImpl*
+sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone)
{
- 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") {
- xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model");
- xbt_assert(not network_model_name.empty(), "Set a network model to use with the 'compound' host model");
-
- int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name);
- surf_cpu_model_description[cpu_id].model_init_preparse();
+ /* search the routing model */
+ simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr;
- int network_id = find_model_description(surf_network_model_description, network_model_name);
- surf_network_model_description[network_id].model_init_preparse();
+ if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) {
+ new_zone = new simgrid::kernel::routing::ClusterZone(zone->id);
+ } else if (strcasecmp(zone->routing.c_str(), "ClusterDragonfly") == 0) {
+ new_zone = new simgrid::kernel::routing::DragonflyZone(zone->id);
+ } else if (strcasecmp(zone->routing.c_str(), "ClusterTorus") == 0) {
+ new_zone = new simgrid::kernel::routing::TorusZone(zone->id);
+ } else if (strcasecmp(zone->routing.c_str(), "ClusterFatTree") == 0) {
+ new_zone = new simgrid::kernel::routing::FatTreeZone(zone->id);
+ } else if (strcasecmp(zone->routing.c_str(), "Dijkstra") == 0) {
+ new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, false);
+ } else if (strcasecmp(zone->routing.c_str(), "DijkstraCache") == 0) {
+ new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, true);
+ } else if (strcasecmp(zone->routing.c_str(), "Floyd") == 0) {
+ new_zone = new simgrid::kernel::routing::FloydZone(zone->id);
+ } else if (strcasecmp(zone->routing.c_str(), "Full") == 0) {
+ new_zone = new simgrid::kernel::routing::FullZone(zone->id);
+ } else if (strcasecmp(zone->routing.c_str(), "None") == 0) {
+ new_zone = new simgrid::kernel::routing::EmptyZone(zone->id);
+ } else if (strcasecmp(zone->routing.c_str(), "Vivaldi") == 0) {
+ new_zone = new simgrid::kernel::routing::VivaldiZone(zone->id);
+ } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) {
+ new_zone = new simgrid::kernel::routing::WifiZone(zone->id);
+ } else {
+ xbt_die("Not a valid model!");
}
+ new_zone->set_parent(current_routing);
- XBT_DEBUG("Call host_model_init");
- int host_id = find_model_description(surf_host_model_description, host_model_name);
- surf_host_model_description[host_id].model_init_preparse();
-
- XBT_DEBUG("Call vm_model_init");
- surf_vm_model_init_HL13();
-
- XBT_DEBUG("Call disk_model_init");
- int disk_id = find_model_description(surf_disk_model_description, disk_model_name);
- surf_disk_model_description[disk_id].model_init_preparse();
+ if (current_routing) {
+ /* set the father behavior */
+ if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
+ current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive;
+ /* add to the sons dictionary */
+ current_routing->add_child(new_zone);
+ /* set models from parent netzone */
+ new_zone->set_network_model(current_routing->get_network_model());
+ new_zone->set_cpu_pm_model(current_routing->get_cpu_pm_model());
+ new_zone->set_cpu_vm_model(current_routing->get_cpu_vm_model());
+ new_zone->set_disk_model(current_routing->get_disk_model());
+ new_zone->set_host_model(current_routing->get_host_model());
+ }
+ return new_zone;
}
/**
*/
simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone)
{
- if (not surf_parse_models_setup_already_called) {
- 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.
- * That is, after the last <config> tag, if any, and before the first of cluster|peer|zone|trace|trace_connect
- *
- * I'm not sure for <trace> and <trace_connect>, 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_parse_models_setup_already_called = 1;
- surf_config_models_setup();
- }
+ /* First create the zone.
+ * This order is important to assure that root netzone is set when models are setting
+ * the default mode for each resource (CPU, network, etc)
+ */
+ auto* new_zone = sg_platf_create_zone(zone);
_sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent
* any further config now that we created some real content */
- /* search the routing model */
- simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr;
- simgrid::kernel::resource::NetworkModel* netmodel =
- current_routing == nullptr ? surf_network_model : current_routing->network_model_;
- if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) {
- new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id, netmodel);
- } else if (strcasecmp(zone->routing.c_str(),"ClusterDragonfly") == 0) {
- new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id, netmodel);
- } else if (strcasecmp(zone->routing.c_str(),"ClusterTorus") == 0) {
- new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id, netmodel);
- } else if (strcasecmp(zone->routing.c_str(),"ClusterFatTree") == 0) {
- new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id, netmodel);
- } else if (strcasecmp(zone->routing.c_str(),"Dijkstra") == 0) {
- new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, false);
- } else if (strcasecmp(zone->routing.c_str(),"DijkstraCache") == 0) {
- new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, true);
- } else if (strcasecmp(zone->routing.c_str(),"Floyd") == 0) {
- new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id, netmodel);
- } else if (strcasecmp(zone->routing.c_str(),"Full") == 0) {
- new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id, netmodel);
- } else if (strcasecmp(zone->routing.c_str(),"None") == 0) {
- new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id, netmodel);
- } else if (strcasecmp(zone->routing.c_str(),"Vivaldi") == 0) {
- new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel);
- } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) {
- new_zone = new simgrid::kernel::routing::WifiZone(current_routing, zone->id, netmodel);
- } else {
- xbt_die("Not a valid model!");
- }
-
- if (current_routing == nullptr) { /* it is the first one */
- simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone->get_iface());
- } else {
- /* set the father behavior */
- if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
- current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive;
- /* add to the sons dictionary */
- current_routing->get_children()->push_back(new_zone);
- }
-
/* set the new current component of the tree */
current_routing = new_zone;
simgrid::s4u::NetZone::on_creation(*new_zone->get_iface()); // notify the signal
xbt_assert(current_routing, "Cannot seal the current Zone: zone under construction");
current_routing->seal();
simgrid::s4u::NetZone::on_seal(*current_routing->get_iface());
- current_routing = current_routing->get_father();
+ current_routing = current_routing->get_parent();
}
/** @brief Add a link connecting a host to the rest of its Zone (which must be cluster or vivaldi) */
xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str());
xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str());
- auto* as_cluster = static_cast<simgrid::kernel::routing::ClusterZone*>(current_routing);
+ auto* cluster_zone = static_cast<simgrid::kernel::routing::ClusterZone*>(current_routing);
- if (as_cluster->private_links_.find(netpoint->id()) != as_cluster->private_links_.end())
+ if (cluster_zone->private_link_exists_at(netpoint->id()))
surf_parse_error(std::string("Host_link for '") + hostlink->id.c_str() + "' is already defined!");
XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id());
- as_cluster->private_links_.insert({netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}});
+ cluster_zone->add_private_link_at(netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()});
}
void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* profile)
