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

Fixed Win32 QPC timestamp diff that caused extraordinarily large inter-packet timing

Browse Source
This commit is contained in:
Srivats P. 2012-03-09 22:15:06 +05:30
parent 87ee8244fc
commit 31c7f08e7c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/pcapport.cpp
View File

@ -59,7 +59,7 @@ static void inline getTimeStamp(TimeStamp* stamp)
static long inline udiffTimeStamp(const TimeStamp *start, const TimeStamp *end) static long inline udiffTimeStamp(const TimeStamp *start, const TimeStamp *end)
{ {
if (end->QuadPart > start->QuadPart) if (end->QuadPart >= start->QuadPart)
return (end->QuadPart - start->QuadPart)*long(1e6)/gTicksFreq; return (end->QuadPart - start->QuadPart)*long(1e6)/gTicksFreq;
else else
{ {
@ -531,6 +531,7 @@ _restart:
getTimeStamp(&ovrEnd); getTimeStamp(&ovrEnd);
overHead += seq->usecDuration_ overHead += seq->usecDuration_
- udiffTimeStamp(&ovrStart, &ovrEnd); - udiffTimeStamp(&ovrStart, &ovrEnd);
Q_ASSERT(overHead <= 0);
} }
if (stop_) if (stop_)
ret = -2; ret = -2;
@ -614,6 +615,7 @@ int PcapPort::PortTransmitter::sendQueueTransmit(pcap_t *p,
getTimeStamp(&ovrEnd); getTimeStamp(&ovrEnd);
overHead -= udiffTimeStamp(&ovrStart, &ovrEnd); overHead -= udiffTimeStamp(&ovrStart, &ovrEnd);
Q_ASSERT(overHead <= 0);
usec += overHead; usec += overHead;
if (usec > 0) if (usec > 0)
{ {