} // 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()
{
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);
+ 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
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->policy);
- if (args->policy != simgrid::s4u::Link::SharingPolicy::WIFI)
- link->get_impl()->set_latency(args->latency);
-
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->seal();
+ 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)
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->set_loopback();
+ current_zone->set_loopback();
}
if (cluster->limiter_link > 0) {
- current_as->set_limiter();
+ current_zone->set_limiter();
}
for (int const& i : *cluster->radicals) {
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->add_private_link_at(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)
sg_platf_new_link(&link);
linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link);
linkUp = linkDown;
- current_as->add_private_link_at(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
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->set_router(sg_platf_new_router(cluster->router_id, nullptr));
+ current_zone->set_router(sg_platf_new_router(cluster->router_id, nullptr));
// Make the backbone
if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) {
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);
xbt_assert(not cluster->has_backbone(), "Cluster %s already has a backbone link!", cluster->get_cname());
cluster->set_backbone(bb);
- XBT_DEBUG("Add a backbone to AS '%s'", current_routing->get_cname());
+ XBT_DEBUG("Add a backbone to zone '%s'", current_routing->get_cname());
}
void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet)
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);
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()
-{
- 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();
-
- int network_id = find_model_description(surf_network_model_description, network_model_name);
- surf_network_model_description[network_id].model_init_preparse();
- }
-
- 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");
- /* ideally we should get back the pointer to CpuModel from model_init_preparse(), but this
- * requires changing the declaration of surf_cpu_model_description.
- * To be reviewed in the future */
- surf_vm_model_init_HL13(
- simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get());
-
- 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();
-}
-
/**
* @brief Auxiliary function to build the object NetZoneImpl
*
}
new_zone->set_parent(current_routing);
- if (current_routing == nullptr) { /* it is the first one */
- simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone->get_iface());
- } else {
+ 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;
*/
auto* new_zone = sg_platf_create_zone(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();
- }
-
_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 */
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_link_exists_at(netpoint->id()))
+ 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->add_private_link_at(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)
