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
small cleanups here and there
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
0375f64
..
efd328b
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-299,7
+299,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
std::vector<Link*> *route = new std::vector<Link*>();
std::vector<Link*> *route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency (action->src
Elm_, action->dstElm
_, route, NULL);
+ routing_platf->getRouteAndLatency (action->src
_, action->dst
_, route, NULL);
for (auto link : *route)
TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
delete route;
for (auto link : *route)
TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
delete route;
@@
-364,8
+364,8
@@
NetworkNS3Action::NetworkNS3Action(Model *model, double size, NetCard *src, NetC
{
XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
{
XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
- src
Elm
_ = src;
- dst
Elm
_ = dst;
+ src_ = src;
+ dst_ = dst;
ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, this);
Link::onCommunicate(this, src, dst);
ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, this);
Link::onCommunicate(this, src, dst);