summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorORGERIE Anne-Cecile <anne-cecile.orgerie@inria.fr>2019-07-19 10:22:28 +0200
committerORGERIE Anne-Cecile <anne-cecile.orgerie@inria.fr>2019-07-19 10:22:28 +0200
commit4a7ae69dc1baab37e23d74ad12314f98bddda50e (patch)
treed99d7b38fde6bba67feb8d92d2762853d8ee13f2 /src
parentfd455e9f8d492ecb441a297720b0bf9d03b897cb (diff)
parent8291ba58641595f2ed132003b65b00e57aba198f (diff)
Merge branch 'master' of gitlab.inria.fr:lguegan/paper-lowrate-iot
Diffstat (limited to 'src')
-rw-r--r--src/ns3/nix/simulator/main.cc3
-rwxr-xr-xsrc/ns3/nix/simulator/simulatorbin1172624 -> 1211344 bytes
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ns3/nix/simulator/main.cc b/src/ns3/nix/simulator/main.cc
index a8ec8cf..796f7b9 100644
--- a/src/ns3/nix/simulator/main.cc
+++ b/src/ns3/nix/simulator/main.cc
@@ -65,7 +65,8 @@ int main(int argc, char* argv[]){
for (std::map< FlowId, FlowMonitor::FlowStats>::iterator flow=stats.begin(); flow!=stats.end(); flow++)
{
Ipv4FlowClassifier::FiveTuple t = classifier->FindFlow(flow->first);
- NS_LOG_UNCOND("Flow " <<t.sourceAddress<< " -> "<< t.destinationAddress << " delay = " <<flow->second.delaySum.GetSeconds());
+ //NS_LOG_UNCOND("Flow " <<t.sourceAddress<< " -> "<< t.destinationAddress << " delay = " <<flow->second.delaySum.GetSeconds());
+ NS_LOG_UNCOND("Flow " <<t.sourceAddress<< " -> "<< t.destinationAddress << " delay = " <<flow->second.delaySum.GetSeconds()/flow->second.rxPackets);
}
diff --git a/src/ns3/nix/simulator/simulator b/src/ns3/nix/simulator/simulator
index 295bdbb..a59dbeb 100755
--- a/src/ns3/nix/simulator/simulator
+++ b/src/ns3/nix/simulator/simulator
Binary files differ