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
move all network models to the kernel::resource namespace
[simgrid.git]
/
src
/
kernel
/
routing
/
ClusterZone.cpp
diff --git
a/src/kernel/routing/ClusterZone.cpp
b/src/kernel/routing/ClusterZone.cpp
index
d5da906
..
e3f8505
100644
(file)
--- a/
src/kernel/routing/ClusterZone.cpp
+++ b/
src/kernel/routing/ClusterZone.cpp
@@
-21,29
+21,30
@@
ClusterZone::ClusterZone(NetZone* father, std::string name) : NetZoneImpl(father
{
}
-void ClusterZone::get
LocalR
oute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void ClusterZone::get
_local_r
oute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
{
- XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->get
Cname(), src->id(), dst->getC
name(), dst->id());
+ XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->get
_cname(), src->id(), dst->get_c
name(), dst->id());
xbt_assert(not private_links_.empty(),
"Cluster routing: no links attached to the source node - did you use host_link tag?");
if ((src->id() == dst->id()) && has_loopback_) {
- xbt_assert(not src->is
R
outer(), "Routing from a cluster private router to itself is meaningless");
+ xbt_assert(not src->is
_r
outer(), "Routing from a cluster private router to itself is meaningless");
- std::pair<
surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePosition
(src->id()));
+ std::pair<
resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos
(src->id()));
route->link_list.push_back(info.first);
if (lat)
*lat += info.first->latency();
return;
}
- if (not src->is
R
outer()) { // No private link for the private router
+ if (not src->is
_r
outer()) { // No private link for the private router
if (has_limiter_) { // limiter for sender
- std::pair<
surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithL
oopback(src->id()));
+ std::pair<
resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_l
oopback(src->id()));
route->link_list.push_back(info.first);
}
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithLimiter(src->id()));
+ std::pair<resource::LinkImpl*, resource::LinkImpl*> info =
+ private_links_.at(node_pos_with_loopback_limiter(src->id()));
if (info.first) { // link up
route->link_list.push_back(info.first);
if (lat)
@@
-57,44
+58,45
@@
void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs*
*lat += backbone_->latency();
}
- if (not dst->is
R
outer()) { // No specific link for router
+ if (not dst->is
_r
outer()) { // No specific link for router
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithLimiter(dst->id()));
+ std::pair<resource::LinkImpl*, resource::LinkImpl*> info =
+ private_links_.at(node_pos_with_loopback_limiter(dst->id()));
if (info.second) { // link down
route->link_list.push_back(info.second);
if (lat)
*lat += info.second->latency();
}
if (has_limiter_) { // limiter for receiver
- info = private_links_.at(node
PositionWithL
oopback(dst->id()));
+ info = private_links_.at(node
_pos_with_l
oopback(dst->id()));
route->link_list.push_back(info.first);
}
}
}
-void ClusterZone::get
G
raph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
- std::map<std::string, xbt_edge_t>* edges)
+void ClusterZone::get
_g
raph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
+
std::map<std::string, xbt_edge_t>* edges)
{
xbt_assert(router_,
"Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph.");
/* create the router */
- xbt_node_t routerNode = new_xbt_graph_node(graph, router_->get
C
name(), nodes);
+ xbt_node_t routerNode = new_xbt_graph_node(graph, router_->get
_c
name(), nodes);
xbt_node_t backboneNode = nullptr;
if (backbone_) {
- backboneNode = new_xbt_graph_node(graph, backbone_->get
C
name(), nodes);
+ backboneNode = new_xbt_graph_node(graph, backbone_->get
_c
name(), nodes);
new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
}
for (auto const& src : getVertices()) {
- if (not src->is
R
outer()) {
- xbt_node_t previous = new_xbt_graph_node(graph, src->get
C
name(), nodes);
+ if (not src->is
_r
outer()) {
+ xbt_node_t previous = new_xbt_graph_node(graph, src->get
_c
name(), nodes);
- std::pair<
surf::LinkImpl*, surf
::LinkImpl*> info = private_links_.at(src->id());
+ std::pair<
resource::LinkImpl*, resource
::LinkImpl*> info = private_links_.at(src->id());
if (info.first) { // link up
- xbt_node_t current = new_xbt_graph_node(graph, info.first->get
C
name(), nodes);
+ xbt_node_t current = new_xbt_graph_node(graph, info.first->get
_c
name(), nodes);
new_xbt_graph_edge(graph, previous, current, edges);
if (backbone_) {
@@
-105,7
+107,7
@@
void ClusterZone::getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>*
}
if (info.second) { // link down
- xbt_node_t current = new_xbt_graph_node(graph, info.second->get
C
name(), nodes);
+ xbt_node_t current = new_xbt_graph_node(graph, info.second->get
_c
name(), nodes);
new_xbt_graph_edge(graph, previous, current, edges);
if (backbone_) {
@@
-129,13
+131,13
@@
void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, in
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);
-
surf::LinkImpl *
linkUp;
-
surf::LinkImpl *
linkDown;
+
resource::LinkImpl*
linkUp;
+
resource::LinkImpl*
linkDown;
if (link.policy == SURF_LINK_SPLITDUPLEX) {
- linkUp =
surf
::LinkImpl::byName(link_id + "_UP");
- linkDown =
surf
::LinkImpl::byName(link_id + "_DOWN");
+ linkUp =
resource
::LinkImpl::byName(link_id + "_UP");
+ linkDown =
resource
::LinkImpl::byName(link_id + "_DOWN");
} else {
- linkUp =
surf
::LinkImpl::byName(link_id);
+ linkUp =
resource
::LinkImpl::byName(link_id);
linkDown = linkUp;
}
private_links_.insert({position, {linkUp, linkDown}});