F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flow-monitor (fixes #1097): add logging of max. and min. packet delay in FlowMonitor

Browse Source
This commit is contained in:
Andreas Boltres
2024-06-19 15:00:08 +00:00
committed by Tommaso Pecorella
parent 861f2079d2
commit 5cde4cf435
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/flow-monitor/model/flow-monitor.cc
View File

@@ -24,6 +24,7 @@
#include "ns3/simulator.h"
#include <fstream>
#include <limits>
#include <sstream>
#define PERIODIC_CHECK_INTERVAL (Seconds(1))
@@ -125,6 +126,8 @@ FlowMonitor::GetStatsForFlow(FlowId flowId)
ref.delaySum = Seconds(0);
ref.jitterSum = Seconds(0);
ref.lastDelay = Seconds(0);
ref.maxDelay = Seconds(0);
ref.minDelay = Seconds(std::numeric_limits<double>::max());
ref.txBytes = 0;
ref.rxBytes = 0;
ref.txPackets = 0;
@@ -245,6 +248,14 @@ FlowMonitor::ReportLastRx(Ptr<FlowProbe> probe,
}
}
stats.lastDelay = delay;
if (delay > stats.maxDelay)
{
stats.maxDelay = delay;
}
if (delay < stats.minDelay)
{
stats.minDelay = delay;
}
stats.rxBytes += packetSize;
stats.packetSizeHistogram.AddValue((double)packetSize);
@@ -448,8 +459,9 @@ FlowMonitor::SerializeToXmlStream(std::ostream& os,
os << "<Flow flowId=\"" << flowI->first << "\"" << ATTRIB_TIME(timeFirstTxPacket)
<< ATTRIB_TIME(timeFirstRxPacket) << ATTRIB_TIME(timeLastTxPacket)
<< ATTRIB_TIME(timeLastRxPacket) << ATTRIB_TIME(delaySum) << ATTRIB_TIME(jitterSum)
<< ATTRIB_TIME(lastDelay) << ATTRIB(txBytes) << ATTRIB(rxBytes) << ATTRIB(txPackets)
<< ATTRIB(rxPackets) << ATTRIB(lostPackets) << ATTRIB(timesForwarded) << ">\n";
<< ATTRIB_TIME(lastDelay) << ATTRIB_TIME(maxDelay) << ATTRIB_TIME(minDelay)
<< ATTRIB(txBytes) << ATTRIB(rxBytes) << ATTRIB(txPackets) << ATTRIB(rxPackets)
<< ATTRIB(lostPackets) << ATTRIB(timesForwarded) << ">\n";
#undef ATTRIB_TIME
#undef ATTRIB
@@ -537,6 +549,8 @@ FlowMonitor::ResetAllStats()
flowStat.delaySum = Seconds(0);
flowStat.jitterSum = Seconds(0);
flowStat.lastDelay = Seconds(0);
flowStat.maxDelay = Seconds(0);
flowStat.minDelay = Seconds(std::numeric_limits<double>::max());
flowStat.txBytes = 0;
flowStat.rxBytes = 0;
flowStat.txPackets = 0;

4
src/flow-monitor/model/flow-monitor.h
View File

@@ -89,6 +89,10 @@ class FlowMonitor : public Object
/// Contains the last measured delay of a packet
/// It is stored to measure the packet's Jitter
Time lastDelay;
/// Contains the largest measured delay of a received packet
Time maxDelay;
/// Contains the smallest measured delay of a received packet
Time minDelay;
/// Total number of transmitted bytes for the flow
uint64_t txBytes;