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
rename the datacontainers allowing the trace:connect tag
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
7a62ae1
..
fd34a63
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-307,8
+307,7
@@
Link* NetworkNS3Model::createLink(const char *name,
xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
{
xbt_dynar_t route = NULL;
xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
{
xbt_dynar_t route = NULL;
- routing_get_route_and_latency(src, dst, &route, NULL);
- //routing_platf->getRouteAndLatency(src, dst, &route, NULL);
+ routing_platf->getRouteAndLatency(src, dst, &route, NULL);
return route;
}
return route;
}
@@
-379,7
+378,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
xbt_dynar_t route = NULL;
xbt_dynar_t route = NULL;
- routing_
get_route_and_l
atency (action->p_srcElm, action->p_dstElm, &route, NULL);
+ routing_
platf->getRouteAndL
atency (action->p_srcElm, action->p_dstElm, &route, NULL);
unsigned int i;
for (i = 0; i < xbt_dynar_length (route); i++){
NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));
unsigned int i;
for (i = 0; i < xbt_dynar_length (route); i++){
NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));