/** The current AS in the parsing */
static simgrid::kernel::routing::AsImpl *current_routing = nullptr;
-static simgrid::kernel::routing::AsImpl* routing_get_current()
+static simgrid::kernel::routing::AsImpl *routing_get_current()
{
return current_routing;
}
info_loop.linkUp = Link::byName(tmp_link);
info_loop.linkDown = Link::byName(tmp_link);
free(tmp_link);
+
auto as_cluster = static_cast<AsCluster*>(current_as);
- if (rankId*as_cluster->linkCountPerNode_ >= static_cast<int>(as_cluster->privateLinks_.size())){
- s_surf_parsing_link_up_down_t dummy;
- dummy.linkUp = nullptr;
- dummy.linkDown = nullptr;
- as_cluster->privateLinks_.resize(rankId*as_cluster->linkCountPerNode_,dummy);
- }
- as_cluster->privateLinks_.insert(as_cluster->privateLinks_.begin() + rankId*as_cluster->linkCountPerNode_,
- info_loop);
+ as_cluster->privateLinks_.insert({rankId*as_cluster->linkCountPerNode_, info_loop});
}
//add a limiter link (shared link to account for maximal bandwidth of the node)
sg_platf_new_link(&link);
info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link);
free(tmp_link);
- current_as->privateLinks_.insert(current_as->privateLinks_.begin() + rankId * current_as->linkCountPerNode_ +
- current_as->hasLoopback_ , info_lim);
+ current_as->privateLinks_.insert(
+ {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , info_lim});
}
//call the cluster function that adds the others links
if (cluster->topology == SURF_CLUSTER_FAT_TREE) {
- ((AsClusterFatTree*) current_as)->addProcessingNode(i);
+ static_cast<AsClusterFatTree*>(current_as)->addProcessingNode(i);
}
else {
current_as->create_links_for_node(cluster, i, rankId,
XBT_DEBUG("Starting Process %s(%s) right now",
arg->name.c_str(), sg_host_get_name(host));
- if (simix_global->create_process_function)
- process_created = simix_global->create_process_function(
- arg->name.c_str(), std::move(code), nullptr,
- sg_host_get_name(host), kill_time,
- current_property_set, auto_restart, nullptr);
- else
- process_created = simcall_process_create(
- arg->name.c_str(), std::move(code), nullptr, sg_host_get_name(host), kill_time,
- current_property_set,auto_restart);
+ process_created = simix_global->create_process_function(
+ arg->name.c_str(), std::move(code), nullptr,
+ sg_host_get_name(host), kill_time,
+ current_property_set, auto_restart, nullptr);
/* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
if (!process_created) {
xbt_assert(link_up_down.linkUp, "Link '%s' not found!",hostlink->link_up);
xbt_assert(link_up_down.linkDown, "Link '%s' not found!",hostlink->link_down);
- // If dynar is is greater than netcard id and if the host_link is already defined
auto as_cluster = static_cast<simgrid::kernel::routing::AsCluster*>(current_routing);
- if(static_cast<int>(as_cluster->privateLinks_.size()) > netcard->id()){
- if (as_cluster->privateLinks_.at(netcard->id()).linkUp != nullptr)
+
+ if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end())
surf_parse_error("Host_link for '%s' is already defined!",hostlink->id);
- } else {
- s_surf_parsing_link_up_down_t dummy;
- dummy.linkUp = nullptr;
- dummy.linkDown = nullptr;
- as_cluster->privateLinks_.resize(netcard->id(), dummy);
- }
+
XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name(), netcard->id());
- as_cluster->privateLinks_.insert(as_cluster->privateLinks_.begin() + netcard->id(), link_up_down);
+ as_cluster->privateLinks_.insert({netcard->id(), link_up_down});
}