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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
routing
/
ClusterZone.cpp
diff --git
a/src/kernel/routing/ClusterZone.cpp
b/src/kernel/routing/ClusterZone.cpp
index
f8bfb2e
..
26c7a1e
100644
(file)
--- a/
src/kernel/routing/ClusterZone.cpp
+++ b/
src/kernel/routing/ClusterZone.cpp
@@
-21,7
+21,7
@@
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->get_cname(), dst->id());
xbt_assert(not private_links_.empty(),
@@
-30,50
+30,52
@@
void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs*
if ((src->id() == dst->id()) && has_loopback_) {
xbt_assert(not src->is_router(), "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();
+ *lat += info.first->
get_
latency();
return;
}
if (not src->is_router()) { // 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)
- *lat += info.first->latency();
+ *lat += info.first->
get_
latency();
}
}
if (backbone_) {
route->link_list.push_back(backbone_);
if (lat)
- *lat += backbone_->latency();
+ *lat += backbone_->
get_
latency();
}
if (not dst->is_router()) { // 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();
+ *lat += info.second->
get_
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.");
@@
-91,7
+93,7
@@
void ClusterZone::getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>*
if (not src->is_router()) {
xbt_node_t previous = new_xbt_graph_node(graph, src->get_cname(), 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_cname(), nodes);
@@
-129,16
+131,16
@@
void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, in
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);
- s
urf::LinkImpl *
linkUp;
- s
urf::LinkImpl *
linkDown;
- if (link.policy ==
SURF_LINK_
SPLITDUPLEX) {
- linkUp = s
urf::LinkImpl::byN
ame(link_id + "_UP");
- linkDown = s
urf::LinkImpl::byN
ame(link_id + "_DOWN");
+ s
4u::Link*
linkUp;
+ s
4u::Link*
linkDown;
+ if (link.policy ==
simgrid::s4u::Link::SharingPolicy::
SPLITDUPLEX) {
+ linkUp = s
4u::Link::by_n
ame(link_id + "_UP");
+ linkDown = s
4u::Link::by_n
ame(link_id + "_DOWN");
} else {
- linkUp = s
urf::LinkImpl::byN
ame(link_id);
+ linkUp = s
4u::Link::by_n
ame(link_id);
linkDown = linkUp;
}
- private_links_.insert({position, {linkUp
, linkDown
}});
+ private_links_.insert({position, {linkUp
->get_impl(), linkDown->get_impl()
}});
}
}
}