Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fix

Browse source
This commit is contained in:
Roxanne Skelly 2019-02-27 15:58:49 -08:00
parent e2e1edc8b0
commit 03326cd471
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/networking/src/NodeList.h
View file

@ -100,7 +100,7 @@ public:
virtual Node::LocalID getDomainLocalID() const override { return _domainHandler.getLocalID(); } virtual Node::LocalID getDomainLocalID() const override { return _domainHandler.getLocalID(); }
virtual HifiSockAddr getDomainSockAddr() const override { return _domainHandler.getSockAddr(); } virtual HifiSockAddr getDomainSockAddr() const override { return _domainHandler.getSockAddr(); }
unsigned getGlobalPostedEventCount() { return _globalPostedEvents; } int getGlobalPostedEventCount() { return _globalPostedEvents; }
public slots: public slots:
void reset(bool skipDomainHandlerReset = false); void reset(bool skipDomainHandlerReset = false);
@ -173,7 +173,7 @@ private:
bool _isShuttingDown { false }; bool _isShuttingDown { false };
QTimer _keepAlivePingTimer; QTimer _keepAlivePingTimer;
bool _requestsDomainListData { false }; bool _requestsDomainListData { false };
unsigned _globalPostedEvents { 0 }; int _globalPostedEvents { 0 };
bool _sendDomainServerCheckInEnabled { true }; bool _sendDomainServerCheckInEnabled { true };

3
libraries/networking/src/ThreadedAssignment.cpp
View file

@ -106,9 +106,8 @@ void ThreadedAssignment::addPacketStatsAndSendStatsPacket(QJsonObject statsObjec
QJsonObject assignmentStats; QJsonObject assignmentStats;
assignmentStats["numQueuedCheckIns"] = _numQueuedCheckIns; assignmentStats["numQueuedCheckIns"] = _numQueuedCheckIns;
assignmentStats["globalPostedEventCount"] = (long long)nodeList->getGlobalPostedEventCount(); assignmentStats["globalPostedEventCount"] = nodeList->getGlobalPostedEventCount();
assignmentStats["domainReportDuration"] = domainServerReportPerSec.count();
statsObject["assignmentStats"] = assignmentStats; statsObject["assignmentStats"] = assignmentStats;
nodeList->sendStatsToDomainServer(statsObject); nodeList->sendStatsToDomainServer(statsObject);

1
libraries/networking/src/ThreadedAssignment.h
View file

@ -49,7 +49,6 @@ protected:
QTimer _statsTimer; QTimer _statsTimer;
int _numQueuedCheckIns { 0 }; int _numQueuedCheckIns { 0 };
p_high_resolution_clock::time_point timestamp; p_high_resolution_clock::time_point timestamp;
std::chrono::milliseconds domainServerReportPerSec{ 0 };
protected slots: protected slots:
void domainSettingsRequestFailed(); void domainSettingsRequestFailed();