matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inaccurate low tx rates (~1000pps) in seq mode

Browse Source 
Creation of explicit packet sets had both a packet set delay and a list loop
delay set leading to lower than configured rate at tx. Earlier implicit
packet set always had set delay as 0 and only list loop delay was used.

Fix is to always set list loop delay to 0 in sequential mode as packet set
will have the correct delay set due to explicit packet sets.
This commit is contained in:
Srivats P 2023-06-22 10:47:13 +05:30
parent 2941c7ec22
commit c044880f1a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/abstractport.cpp
View File

@ -343,7 +343,8 @@ int AbstractPort::updatePacketListSequential()
if (n >= 1) { if (n >= 1) {
loopNextPacketSet(x, n, 0, loopDelay); loopNextPacketSet(x, n, 0, loopDelay);
qDebug("PacketSet: n = %lu, x = %lu", n, x); qDebug("PacketSet: n = %lu, x = %lu, delay = %llu ns",
n, x, loopDelay);
} }
else if (n == 0) else if (n == 0)
x = 0; x = 0;
@ -365,7 +366,8 @@ int AbstractPort::updatePacketListSequential()
// Create a packet set for 'y' with repeat = 1 // Create a packet set for 'y' with repeat = 1
if (j == x) { if (j == x) {
loopNextPacketSet(y, 1, 0, loopDelay); loopNextPacketSet(y, 1, 0, loopDelay);
qDebug("PacketSet: n = 1, y = %lu", y); qDebug("PacketSet: n = 1, y = %lu, delay = %llu",
y, loopDelay);
} }
qDebug("q(%d, %d) sec = %lu nsec = %lu", qDebug("q(%d, %d) sec = %lu nsec = %lu",
@ -440,9 +442,10 @@ int AbstractPort::updatePacketListSequential()
returnToQIdx = 0; returnToQIdx = 0;
*/ */
setPacketListLoopMode(true, 0, // XXX: no list loop delay required since we don't create
streamList_[i]->sendUnit() == // any implicit packet sets now
StreamBase::e_su_bursts ? ibg1 : ipg1); setPacketListLoopMode(true, 0, 0);
qDebug("Seq mode list loop true with 0 delay");
goto _stop_no_more_pkts; goto _stop_no_more_pkts;
case StreamBase::e_nw_goto_next: case StreamBase::e_nw_goto_next:
@ -735,7 +738,10 @@ int AbstractPort::updatePacketListInterleaved()
} while ((sec < durSec) || ((sec == durSec) && (nsec < durNsec))); } while ((sec < durSec) || ((sec == durSec) && (nsec < durNsec)));
// XXX: For interleaved mode, we ALWAYS have a single packet set with // XXX: For interleaved mode, we ALWAYS have a single packet set with
// one repeat and 0n set loop delay // one repeat and 0 set delay
// TODO: Since we now create an explicit packet set, we can also calc
// the actual packet set delay and set it here and set list loop delay
// as 0
loopNextPacketSet(totalPkts, 1, 0, 0); loopNextPacketSet(totalPkts, 1, 0, 0);
qDebug("Interleaved single PacketSet of size %lld, duration %llu.%09llu " qDebug("Interleaved single PacketSet of size %lld, duration %llu.%09llu "
"repeat 1 and delay 0", "repeat 1 and delay 0",

2
server/pcaptxthread.cpp
View File

@ -290,6 +290,8 @@ void PcapTxThread::run()
packetSequenceList_.at(i)->ttagL4CksumOffset_); packetSequenceList_.at(i)->ttagL4CksumOffset_);
} }
qDebug() << "Loop:" << (returnToQIdx_ >= 0)
<< "LoopDelay:" << loopDelay_;
qDebug() << "First Ttag: " << firstTtagPkt_ qDebug() << "First Ttag: " << firstTtagPkt_
<< "Ttag Markers:" << ttagDeltaMarkers_; << "Ttag Markers:" << ttagDeltaMarkers_;