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' into mc-process
[simgrid.git]
/
src
/
surf
/
surf_routing_vivaldi.cpp
diff --git
a/src/surf/surf_routing_vivaldi.cpp
b/src/surf/surf_routing_vivaldi.cpp
index
92e3bb2
..
efabf71
100644
(file)
--- a/
src/surf/surf_routing_vivaldi.cpp
+++ b/
src/surf/surf_routing_vivaldi.cpp
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. 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. */
+
#include "surf_routing_vivaldi.hpp"
#include "network_interface.hpp"
#include "surf_routing_vivaldi.hpp"
#include "network_interface.hpp"
@@
-22,11
+28,11
@@
void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl
s_surf_parsing_link_up_down_t info;
XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]",
s_surf_parsing_link_up_down_t info;
XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]",
- src->
p_name, src->m_id, dst->p_name, dst->m_id
);
+ src->
getName(), src->getId(), dst->getName(), dst->getId()
);
- if(src->
p_rcType
== SURF_NETWORK_ELEMENT_AS) {
- char *src_name = ROUTER_PEER(src->
p_name
);
- char *dst_name = ROUTER_PEER(dst->
p_name
);
+ if(src->
getRcType()
== SURF_NETWORK_ELEMENT_AS) {
+ char *src_name = ROUTER_PEER(src->
getName()
);
+ char *dst_name = ROUTER_PEER(dst->
getName()
);
route->gw_src = (sg_routing_edge_t) xbt_lib_get_or_null(as_router_lib, src_name, ROUTING_ASR_LEVEL);
route->gw_dst = (sg_routing_edge_t) xbt_lib_get_or_null(as_router_lib, dst_name, ROUTING_ASR_LEVEL);
xbt_free(src_name);
route->gw_src = (sg_routing_edge_t) xbt_lib_get_or_null(as_router_lib, src_name, ROUTING_ASR_LEVEL);
route->gw_dst = (sg_routing_edge_t) xbt_lib_get_or_null(as_router_lib, dst_name, ROUTING_ASR_LEVEL);
xbt_free(src_name);
@@
-37,44
+43,44
@@
void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl
xbt_dynar_t src_ctn, dst_ctn;
char *tmp_src_name, *tmp_dst_name;
xbt_dynar_t src_ctn, dst_ctn;
char *tmp_src_name, *tmp_dst_name;
- if(src->
p_rcType
== SURF_NETWORK_ELEMENT_HOST){
- tmp_src_name = HOST_PEER(src->
p_name
);
+ if(src->
getRcType()
== SURF_NETWORK_ELEMENT_HOST){
+ tmp_src_name = HOST_PEER(src->
getName()
);
if(p_linkUpDownList){
if(p_linkUpDownList){
- info = xbt_dynar_get_as(p_linkUpDownList, src->
m_id
, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(p_linkUpDownList, src->
getId()
, s_surf_parsing_link_up_down_t);
if(info.link_up) { // link up
xbt_dynar_push_as(route->link_list, void*, info.link_up);
if (lat)
if(info.link_up) { // link up
xbt_dynar_push_as(route->link_list, void*, info.link_up);
if (lat)
- *lat +=
dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(info.link_up)
)->getLatency();
+ *lat +=
static_cast<NetworkLinkPtr>(info.link_up
)->getLatency();
}
}
src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL);
}
}
src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL);
- if(!src_ctn ) src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, src->
p_name
, COORD_HOST_LEVEL);
+ if(!src_ctn ) src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, src->
getName()
, COORD_HOST_LEVEL);
}
}
- else if(src->
p_rcType == SURF_NETWORK_ELEMENT_ROUTER || src->p_rcType
== SURF_NETWORK_ELEMENT_AS){
- tmp_src_name = ROUTER_PEER(src->
p_name
);
+ else if(src->
getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType()
== SURF_NETWORK_ELEMENT_AS){
+ tmp_src_name = ROUTER_PEER(src->
getName()
);
src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_src_name, COORD_ASR_LEVEL);
}
else{
THROW_IMPOSSIBLE;
}
src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_src_name, COORD_ASR_LEVEL);
}
else{
THROW_IMPOSSIBLE;
}
- if(dst->
p_rcType
== SURF_NETWORK_ELEMENT_HOST){
- tmp_dst_name = HOST_PEER(dst->
p_name
);
+ if(dst->
getRcType()
== SURF_NETWORK_ELEMENT_HOST){
+ tmp_dst_name = HOST_PEER(dst->
getName()
);
if(p_linkUpDownList){
if(p_linkUpDownList){
- info = xbt_dynar_get_as(p_linkUpDownList, dst->
m_id
, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(p_linkUpDownList, dst->
getId()
, s_surf_parsing_link_up_down_t);
if(info.link_down) { // link down
xbt_dynar_push_as(route->link_list,void*,info.link_down);
if (lat)
if(info.link_down) { // link down
xbt_dynar_push_as(route->link_list,void*,info.link_down);
if (lat)
- *lat +=
dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(info.link_down)
)->getLatency();
+ *lat +=
static_cast<NetworkLinkPtr>(info.link_down
)->getLatency();
}
}
dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL);
}
}
dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL);
- if(!dst_ctn ) dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, dst->
p_name
, COORD_HOST_LEVEL);
+ if(!dst_ctn ) dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, dst->
getName()
, COORD_HOST_LEVEL);
}
}
- else if(dst->
p_rcType == SURF_NETWORK_ELEMENT_ROUTER || dst->p_rcType
== SURF_NETWORK_ELEMENT_AS){
- tmp_dst_name = ROUTER_PEER(dst->
p_name
);
+ else if(dst->
getRcType() == SURF_NETWORK_ELEMENT_ROUTER || dst->getRcType()
== SURF_NETWORK_ELEMENT_AS){
+ tmp_dst_name = ROUTER_PEER(dst->
getName()
);
dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_dst_name, COORD_ASR_LEVEL);
}
else{
dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(as_router_lib, tmp_dst_name, COORD_ASR_LEVEL);
}
else{
@@
-96,7
+102,7
@@
void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl
}
int AsVivaldi::parsePU(RoutingEdgePtr elm) {
}
int AsVivaldi::parsePU(RoutingEdgePtr elm) {
- XBT_DEBUG("Load process unit \"%s\"", elm->
p_name
);
+ XBT_DEBUG("Load process unit \"%s\"", elm->
getName()
);
xbt_dynar_push_as(p_indexNetworkElm, sg_routing_edge_t, elm);
return xbt_dynar_length(p_indexNetworkElm)-1;
}
xbt_dynar_push_as(p_indexNetworkElm, sg_routing_edge_t, elm);
return xbt_dynar_length(p_indexNetworkElm)-1;
}