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
Routing: kill some dupplicated code
[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
3281f1e
..
95bcc1b
100644
(file)
--- a/
src/surf/surf_routing_vivaldi.cpp
+++ b/
src/surf/surf_routing_vivaldi.cpp
@@
-9,6
+9,10
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
+#define HOST_PEER(peername) bprintf("peer_%s", peername)
+#define ROUTER_PEER(peername) bprintf("router_%s", peername)
+#define LINK_PEER(peername) bprintf("link_%s", peername)
+
static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) {
double src_coord, dst_coord;
static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) {
double src_coord, dst_coord;
@@
-18,26
+22,24
@@
static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dyn
return (src_coord-dst_coord)*(src_coord-dst_coord);
}
return (src_coord-dst_coord)*(src_coord-dst_coord);
}
-AS_t model_vivaldi_create(void)
-{
- return new simgrid::surf::AsVivaldi();
-}
-
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
+ AsVivaldi::AsVivaldi(const char *name)
+ : AsGeneric(name)
+ {}
-void AsVivaldi::getRouteAndLatency(
RoutingEdge *src, RoutingEdge
*dst, sg_platf_route_cbarg_t route, double *lat)
+void AsVivaldi::getRouteAndLatency(
NetCard *src, NetCard
*dst, sg_platf_route_cbarg_t route, double *lat)
{
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->getName(), src->getId(), dst->getName(), dst->getId());
+ src->getName(), src->getId(), dst->getName(), dst->getId());
if(src->getRcType() == SURF_NETWORK_ELEMENT_AS) {
char *src_name = ROUTER_PEER(src->getName());
char *dst_name = ROUTER_PEER(dst->getName());
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);
+ route->gw_src = (sg_
netcard
_t) xbt_lib_get_or_null(as_router_lib, src_name, ROUTING_ASR_LEVEL);
+ route->gw_dst = (sg_
netcard
_t) xbt_lib_get_or_null(as_router_lib, dst_name, ROUTING_ASR_LEVEL);
xbt_free(src_name);
xbt_free(dst_name);
}
xbt_free(src_name);
xbt_free(dst_name);
}
@@
-49,17
+51,17
@@
void AsVivaldi::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_
if(src->getRcType() == SURF_NETWORK_ELEMENT_HOST){
tmp_src_name = HOST_PEER(src->getName());
if(src->getRcType() == SURF_NETWORK_ELEMENT_HOST){
tmp_src_name = HOST_PEER(src->getName());
- if
(p_linkUpDownList)
{
- info = xbt_dynar_get_as(
p_linkUpDownList
, src->getId(), s_surf_parsing_link_up_down_t);
+ if
((int)xbt_dynar_length(upDownLinks)>src->getId())
{
+ info = xbt_dynar_get_as(
upDownLinks
, 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)
*lat += static_cast<Link*>(info.link_up)->getLatency();
}
}
if(info.link_up) { // link up
xbt_dynar_push_as(route->link_list, void*, info.link_up);
if (lat)
*lat += static_cast<Link*>(info.link_up)->getLatency();
}
}
- src_ctn = (xbt_dynar_t) simgrid::
Host::by_name_or_create(tmp_src_name)->facet
(COORD_HOST_LEVEL);
+ src_ctn = (xbt_dynar_t) simgrid::
s4u::Host::by_name_or_create(tmp_src_name)->extension
(COORD_HOST_LEVEL);
if (src_ctn == nullptr)
if (src_ctn == nullptr)
- src_ctn = (xbt_dynar_t) simgrid::
Host::by_name_or_create(src->getName())->facet
(COORD_HOST_LEVEL);
+ src_ctn = (xbt_dynar_t) simgrid::
s4u::Host::by_name_or_create(src->getName())->extension
(COORD_HOST_LEVEL);
}
else if(src->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_NETWORK_ELEMENT_AS){
tmp_src_name = ROUTER_PEER(src->getName());
}
else if(src->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_NETWORK_ELEMENT_AS){
tmp_src_name = ROUTER_PEER(src->getName());
@@
-72,19
+74,19
@@
void AsVivaldi::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_
if(dst->getRcType() == SURF_NETWORK_ELEMENT_HOST){
tmp_dst_name = HOST_PEER(dst->getName());
if(dst->getRcType() == SURF_NETWORK_ELEMENT_HOST){
tmp_dst_name = HOST_PEER(dst->getName());
- if
(p_linkUpDownList)
{
- info = xbt_dynar_get_as(
p_linkUpDownList
, dst->getId(), s_surf_parsing_link_up_down_t);
+ if
((int)xbt_dynar_length(upDownLinks)>dst->getId())
{
+ info = xbt_dynar_get_as(
upDownLinks
, 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)
*lat += static_cast<Link*>(info.link_down)->getLatency();
}
}
if(info.link_down) { // link down
xbt_dynar_push_as(route->link_list,void*,info.link_down);
if (lat)
*lat += static_cast<Link*>(info.link_down)->getLatency();
}
}
- dst_ctn = (xbt_dynar_t) simgrid::Host::by_name_or_create(tmp_dst_name)
- ->
facet
(COORD_HOST_LEVEL);
+ dst_ctn = (xbt_dynar_t) simgrid::
s4u::
Host::by_name_or_create(tmp_dst_name)
+ ->
extension
(COORD_HOST_LEVEL);
if (dst_ctn == nullptr)
if (dst_ctn == nullptr)
- dst_ctn = (xbt_dynar_t) simgrid::Host::by_name_or_create(dst->getName())
- ->
facet
(COORD_HOST_LEVEL);
+ dst_ctn = (xbt_dynar_t) simgrid::
s4u::
Host::by_name_or_create(dst->getName())
+ ->
extension
(COORD_HOST_LEVEL);
}
else if(dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || dst->getRcType() == SURF_NETWORK_ELEMENT_AS){
tmp_dst_name = ROUTER_PEER(dst->getName());
}
else if(dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || dst->getRcType() == SURF_NETWORK_ELEMENT_AS){
tmp_dst_name = ROUTER_PEER(dst->getName());
@@
-108,11
+110,5
@@
void AsVivaldi::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_
}
}
}
}
-int AsVivaldi::parsePU(RoutingEdge *elm) {
- 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;
-}
-
}
}
}
}