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
rename the class objects and C types for the As -> NetZone transition
[simgrid.git]
/
src
/
kernel
/
routing
/
ClusterZone.cpp
diff --git
a/src/kernel/routing/ClusterZone.cpp
b/src/kernel/routing/ClusterZone.cpp
index
dc72ef3
..
9a0335b
100644
(file)
--- a/
src/kernel/routing/ClusterZone.cpp
+++ b/
src/kernel/routing/ClusterZone.cpp
@@
-15,11
+15,11
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"
namespace simgrid {
namespace kernel {
namespace routing {
namespace simgrid {
namespace kernel {
namespace routing {
-
AsCluster::AsCluster(As* father, const char* name) : As
Impl(father, name)
+
ClusterZone::ClusterZone(NetZone* father, const char* name) : NetZone
Impl(father, name)
{
}
{
}
-void
AsCluster
::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat)
+void
ClusterZone
::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat)
{
XBT_VERB("cluster getLocalRoute from '%s'[%d] to '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id());
xbt_assert(!privateLinks_.empty(),
{
XBT_VERB("cluster getLocalRoute from '%s'[%d] to '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id());
xbt_assert(!privateLinks_.empty(),
@@
-70,7
+70,7
@@
void AsCluster::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t
}
}
}
}
-void
AsCluster
::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
+void
ClusterZone
::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
{
xbt_assert(router_,
"Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph.");
{
xbt_assert(router_,
"Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph.");
@@
-115,7
+115,7
@@
void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
}
}
}
}
-void
AsCluster
::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int, int position)
+void
ClusterZone
::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int, int position)
{
char* link_id = bprintf("%s_link_%d", cluster->id, id);
{
char* link_id = bprintf("%s_link_%d", cluster->id, id);