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
AS->Zone + stringification
[simgrid.git]
/
src
/
kernel
/
routing
/
TorusZone.cpp
diff --git
a/src/kernel/routing/TorusZone.cpp
b/src/kernel/routing/TorusZone.cpp
index 7f6b210711536d7de814fe8959b0db1820de9b5a..e5c6ce7f4a7a9c97568588246de36712e548604c 100644
(file)
--- a/
src/kernel/routing/TorusZone.cpp
+++ b/
src/kernel/routing/TorusZone.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-201
7
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-27,7
+27,7
@@
inline void rankId_to_coords(int rankId, std::vector<unsigned int> dimensions, u
namespace simgrid {
namespace kernel {
namespace routing {
namespace simgrid {
namespace kernel {
namespace routing {
-TorusZone::TorusZone(NetZone* father,
const char*
name) : ClusterZone(father, name)
+TorusZone::TorusZone(NetZone* father,
std::string
name) : ClusterZone(father, name)
{
}
{
}
@@
-45,7
+45,8
@@
void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
? rank - (current_dimension - 1) * dim_product
: rank + dim_product;
// name of neighbor is not right for non contiguous cluster radicals (as id != rank in this case)
? rank - (current_dimension - 1) * dim_product
: rank + dim_product;
// name of neighbor is not right for non contiguous cluster radicals (as id != rank in this case)
- char* link_id = bprintf("%s_link_from_%i_to_%i", cluster->id, id, neighbor_rank_id);
+ std::string link_id =
+ std::string(cluster->id) + "_link_from_" + std::to_string(id) + "_to_" + std::to_string(neighbor_rank_id);
link.id = link_id;
link.bandwidth = cluster->bw;
link.latency = cluster->lat;
link.id = link_id;
link.bandwidth = cluster->bw;
link.latency = cluster->lat;
@@
-54,12
+55,10
@@
void TorusZone::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 = link_id + "_UP"
;
linkUp = surf::LinkImpl::byName(tmp_link);
linkUp = surf::LinkImpl::byName(tmp_link);
- free(tmp_link);
- tmp_link = bprintf("%s_DOWN", link_id);
+ tmp_link = link_id + "_DOWN";
linkDown = surf::LinkImpl::byName(tmp_link);
linkDown = surf::LinkImpl::byName(tmp_link);
- free(tmp_link);
} else {
linkUp = surf::LinkImpl::byName(link_id);
linkDown = linkUp;
} else {
linkUp = surf::LinkImpl::byName(link_id);
linkDown = linkUp;
@@
-71,7
+70,6
@@
void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
*/
privateLinks_.insert({position + j, {linkUp, linkDown}});
dim_product *= current_dimension;
*/
privateLinks_.insert({position + j, {linkUp, linkDown}});
dim_product *= current_dimension;
- xbt_free(link_id);
}
rank++;
}
}
rank++;
}
@@
-97,7
+95,7
@@
void TorusZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
{
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
{
- XBT_VERB("torus getLocalRoute from '%s'[%
d] to '%s'[%d
]", src->name().c_str(), src->id(), dst->name().c_str(),
+ XBT_VERB("torus getLocalRoute from '%s'[%
u] to '%s'[%u
]", src->name().c_str(), src->id(), dst->name().c_str(),
dst->id());
if (dst->isRouter() || src->isRouter())
dst->id());
if (dst->isRouter() || src->isRouter())
@@
-175,7
+173,7
@@
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
assert(linkOffset >= 0);
}
assert(linkOffset >= 0);
}
- XBT_DEBUG("torus_get_route_and_latency - current_node: %
i
, next_node: %u, linkOffset is %i", current_node,
+ XBT_DEBUG("torus_get_route_and_latency - current_node: %
u
, next_node: %u, linkOffset is %i", current_node,
next_node, linkOffset);
break;
}
next_node, linkOffset);
break;
}