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

Regression Fix: Fix compilation issue on Windows introduced by the RateAccuracy feature

Browse Source
This commit is contained in:
Srivats P 2015-11-06 18:53:27 +05:30
parent 06182a435c
commit 01e8524491
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/pcapport.cpp
View File

@ -328,7 +328,7 @@ PcapPort::PortTransmitter::PortTransmitter(const char *device)
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
LARGE_INTEGER freq; LARGE_INTEGER freq;
if (QueryPerformanceFrequency(&freq)) if (QueryPerformanceFrequency(&freq))
gTicksFreq = ticksFreq_ = freq.QuadPart; gTicksFreq = freq.QuadPart;
else else
Q_ASSERT_X(false, "PortTransmitter::PortTransmitter", Q_ASSERT_X(false, "PortTransmitter::PortTransmitter",
"This Win32 platform does not support performance counter"); "This Win32 platform does not support performance counter");
@ -721,7 +721,7 @@ void PcapPort::PortTransmitter::udelay(unsigned long usec)
LARGE_INTEGER curTicks; LARGE_INTEGER curTicks;
QueryPerformanceCounter(&curTicks); QueryPerformanceCounter(&curTicks);
tgtTicks.QuadPart = curTicks.QuadPart + (usec*ticksFreq_)/1000000; tgtTicks.QuadPart = curTicks.QuadPart + (usec*gTicksFreq)/1000000;
while (curTicks.QuadPart < tgtTicks.QuadPart) while (curTicks.QuadPart < tgtTicks.QuadPart)
QueryPerformanceCounter(&curTicks); QueryPerformanceCounter(&curTicks);

1
server/pcapport.h
View File

@ -181,7 +181,6 @@ protected:
int sendQueueTransmit(pcap_t *p, pcap_send_queue *queue, long &overHead, int sendQueueTransmit(pcap_t *p, pcap_send_queue *queue, long &overHead,
int sync); int sync);
quint64 ticksFreq_;
QList<PacketSequence*> packetSequenceList_; QList<PacketSequence*> packetSequenceList_;
PacketSequence *currentPacketSequence_; PacketSequence *currentPacketSequence_;
int repeatSequenceStart_; int repeatSequenceStart_;