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
Restructure surf++ cpu and network
[simgrid.git]
/
src
/
surf
/
surf_routing_dijkstra.cpp
diff --git
a/src/surf/surf_routing_dijkstra.cpp
b/src/surf/surf_routing_dijkstra.cpp
index
f5f7206
..
9cececc
100644
(file)
--- a/
src/surf/surf_routing_dijkstra.cpp
+++ b/
src/surf/surf_routing_dijkstra.cpp
@@
-5,7
+5,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_routing_dijkstra.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_routing_dijkstra.hpp"
-#include "network.hpp"
+#include "network
_interface
.hpp"
/* Global vars */
extern routing_platf_t routing_platf;
/* Global vars */
extern routing_platf_t routing_platf;
@@
-258,7
+258,7
@@
void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
- *lat += dynamic_cast<Network
Cm02
LinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+ *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
}
}
}
}
@@
-366,7
+366,7
@@
void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_insert_at(route->link_list, pos, &link);
if (lat)
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_insert_at(route->link_list, pos, &link);
if (lat)
- *lat += dynamic_cast<Network
Cm02
LinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+ *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
pos++;
}
}
pos++;
}
}
@@
-375,7
+375,7
@@
void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
- *lat += dynamic_cast<Network
Cm02
LinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
+ *lat += dynamic_cast<NetworkLinkPtr>(static_cast<ResourcePtr>(link))->getLatency();
}
size++;
}
}
size++;
}