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
don't test equality to 0.
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
ab8df9a
..
a2956c8
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-256,7
+256,7
@@
Action *NetworkNS3Model::communicate(simgrid::kernel::routing::NetCard *src,simg
return new NetworkNS3Action(this, size, src, dst);
}
return new NetworkNS3Action(this, size, src, dst);
}
-double NetworkNS3Model::next
_occuring_e
vent(double now)
+double NetworkNS3Model::next
OccuringE
vent(double now)
{
double time_to_next_flow_completion;
XBT_DEBUG("ns3_next_occuring_event");
{
double time_to_next_flow_completion;
XBT_DEBUG("ns3_next_occuring_event");
@@
-267,7
+267,7
@@
double NetworkNS3Model::next_occuring_event(double now)
else
do {
ns3_simulator(now);
else
do {
ns3_simulator(now);
- time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock();
//FIXME: use now instead ?
+ time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock();
} while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
XBT_DEBUG("min : %f", now);
} while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
XBT_DEBUG("min : %f", now);