X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd7651841882fc2795ff07da448a240dbdc90220..92e7e33dd90bba0dd78d4893e68bfbfb03efc3c9:/src/surf/sg_platf.cpp
diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 9079b8c2e2..5c4105df3e 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -100,7 +100,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args)
host->pimpl_cpu->setPState(args->pstate);
if (args->coord && strcmp(args->coord, ""))
new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord);
-
+
}
/** @brief Add a "router" to the network element list */
@@ -120,7 +120,6 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const
if (coords && strcmp(coords, ""))
new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords);
- sg_instr_new_router(name);
return netpoint;
}
@@ -236,18 +235,17 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
simgrid::surf::LinkImpl* linkUp = nullptr;
simgrid::surf::LinkImpl* linkDown = nullptr;
if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
- char *tmp_link = bprintf("%s_loopback", link_id);
- XBT_DEBUG("", tmp_link, cluster->loopback_bw);
+ std::string tmp_link = std::string(link_id) + "_loopback";
+ XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw);
LinkCreationArgs link;
- link.id = tmp_link;
+ link.id = tmp_link.c_str();
link.bandwidth = cluster->loopback_bw;
link.latency = cluster->loopback_lat;
link.policy = SURF_LINK_FATPIPE;
sg_platf_new_link(&link);
- linkUp = simgrid::surf::LinkImpl::byName(tmp_link);
- linkDown = simgrid::surf::LinkImpl::byName(tmp_link);
- free(tmp_link);
+ linkUp = simgrid::surf::LinkImpl::byName(tmp_link.c_str());
+ linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str());
auto as_cluster = static_cast(current_as);
as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}});
@@ -257,18 +255,17 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
linkUp = nullptr;
linkDown = nullptr;
if(cluster->limiter_link > 0){
- char *tmp_link = bprintf("%s_limiter", link_id);
- XBT_DEBUG("", tmp_link, cluster->limiter_link);
+ std::string tmp_link = std::string(link_id) + "_limiter";
+ XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link);
LinkCreationArgs link;
- link.id = tmp_link;
+ link.id = tmp_link.c_str();
link.bandwidth = cluster->limiter_link;
link.latency = 0;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
- linkDown = simgrid::surf::LinkImpl::byName(tmp_link);
+ linkDown = simgrid::surf::LinkImpl::byName(tmp_link.c_str());
linkUp = linkDown;
- free(tmp_link);
current_as->privateLinks_.insert(
{rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}});
}
@@ -352,12 +349,12 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
s_sg_platf_host_link_cbarg_t host_link;
memset(&host_link, 0, sizeof(host_link));
+ std::string tmp_link_up = std::string("link_") + hostname + "_UP";
+ std::string tmp_link_down = std::string("link_") + hostname + "_DOWN";
host_link.id = hostname.c_str();
- host_link.link_up = bprintf("link_%s_UP",hostname.c_str());
- host_link.link_down = bprintf("link_%s_DOWN",hostname.c_str());
+ host_link.link_up = tmp_link_up.c_str();
+ host_link.link_down = tmp_link_down.c_str();
sg_platf_new_hostlink(&host_link);
- free((char*)host_link.link_up);
- free((char*)host_link.link_down);
}
delete cabinet->radicals;
}
@@ -648,7 +645,7 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
if (current_routing == nullptr) { /* it is the first one */
xbt_assert(simgrid::s4u::Engine::instance()->pimpl->netRoot_ == nullptr,
- "All defined components must belong to a AS");
+ "All defined components must belong to a networking zone.");
simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as;
} else {
@@ -678,7 +675,7 @@ void sg_platf_new_AS_seal()
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->seal();
simgrid::s4u::NetZone::onSeal(*current_routing);
- current_routing = static_cast(current_routing->father());
+ current_routing = static_cast(current_routing->father());
}
/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */