A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less bprintf (some were completely useless)
[simgrid.git]
/
src
/
kernel
/
routing
/
ClusterZone.cpp
diff --git
a/src/kernel/routing/ClusterZone.cpp
b/src/kernel/routing/ClusterZone.cpp
index
52f8bb1
..
9467b8d
100644
(file)
--- a/
src/kernel/routing/ClusterZone.cpp
+++ b/
src/kernel/routing/ClusterZone.cpp
@@
-121,7
+121,7
@@
void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges
void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int /*rank*/, int position)
{
void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int /*rank*/, int position)
{
-
char* link_id = bprintf("%s_link_%d", cluster->id,
id);
+
std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(
id);
LinkCreationArgs link;
link.id = link_id;
LinkCreationArgs link;
link.id = link_id;
@@
-133,17
+133,14
@@
void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id
surf::LinkImpl *linkUp;
surf::LinkImpl *linkDown;
if (link.policy == SURF_LINK_FULLDUPLEX) {
surf::LinkImpl *linkUp;
surf::LinkImpl *linkDown;
if (link.policy == SURF_LINK_FULLDUPLEX) {
-
char* tmp_link = bprintf("%s_UP", link_id)
;
+
std::string tmp_link = std::string(link_id) + "_UP"
;
linkUp = surf::LinkImpl::byName(tmp_link);
linkUp = surf::LinkImpl::byName(tmp_link);
- xbt_free(tmp_link);
- tmp_link = bprintf("%s_DOWN", link_id);
+ tmp_link = std::string(link_id) + "_DOWN";
linkDown = surf::LinkImpl::byName(tmp_link);
linkDown = surf::LinkImpl::byName(tmp_link);
- xbt_free(tmp_link);
} else {
linkUp = surf::LinkImpl::byName(link_id);
linkDown = linkUp;
}
} else {
linkUp = surf::LinkImpl::byName(link_id);
linkDown = linkUp;
}
- xbt_free(link_id);
privateLinks_.insert({position, {linkUp, linkDown}});
}
}
privateLinks_.insert({position, {linkUp, linkDown}});
}
}