Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 14:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

couple of entity server corner cases

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-09-15 16:02:22 -07:00
parent 848bb4fccb
commit 22b979a663
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
assignment-client/src/octree/OctreeServer.cpp
View file

@ -906,10 +906,14 @@ void OctreeServer::readConfiguration() {
domainHandler.requestDomainSettings(); domainHandler.requestDomainSettings();
loop.exec(); loop.exec();
qDebug() << "Got domain settings from domain-server.";
if (domainHandler.getSettingsObject().isEmpty()) { if (domainHandler.getSettingsObject().isEmpty()) {
qDebug() << "No settings object from domain-server."; qDebug() << "No settings object from domain-server.";
} }
const QJsonObject& settingsObject = domainHandler.getSettingsObject(); QJsonObject settingsObject { domainHandler.getSettingsObject() };
QString settingsKey = getMyDomainSettingsKey(); QString settingsKey = getMyDomainSettingsKey();
QJsonObject settingsSectionObject = settingsObject[settingsKey].toObject(); QJsonObject settingsSectionObject = settingsObject[settingsKey].toObject();
_settings = settingsSectionObject; // keep this for later _settings = settingsSectionObject; // keep this for later
@ -1334,18 +1338,21 @@ void OctreeServer::sendStatsPacket() {
statsObject2["data"] = dataObject1; statsObject2["data"] = dataObject1;
statsObject2["timing"] = timingArray1; statsObject2["timing"] = timingArray1;
// Stats Object 3
QJsonObject dataArray2; QJsonObject dataArray2;
QJsonObject timingArray2;
// Stats Object 3
if (_octreeInboundPacketProcessor) {
dataArray2["1. packetQueue"] = (double)_octreeInboundPacketProcessor->packetsToProcessCount(); dataArray2["1. packetQueue"] = (double)_octreeInboundPacketProcessor->packetsToProcessCount();
dataArray2["2. totalPackets"] = (double)_octreeInboundPacketProcessor->getTotalPacketsProcessed(); dataArray2["2. totalPackets"] = (double)_octreeInboundPacketProcessor->getTotalPacketsProcessed();
dataArray2["3. totalElements"] = (double)_octreeInboundPacketProcessor->getTotalElementsProcessed(); dataArray2["3. totalElements"] = (double)_octreeInboundPacketProcessor->getTotalElementsProcessed();
QJsonObject timingArray2;
timingArray2["1. avgTransitTimePerPacket"] = (double)_octreeInboundPacketProcessor->getAverageTransitTimePerPacket(); timingArray2["1. avgTransitTimePerPacket"] = (double)_octreeInboundPacketProcessor->getAverageTransitTimePerPacket();
timingArray2["2. avgProcessTimePerPacket"] = (double)_octreeInboundPacketProcessor->getAverageProcessTimePerPacket(); timingArray2["2. avgProcessTimePerPacket"] = (double)_octreeInboundPacketProcessor->getAverageProcessTimePerPacket();
timingArray2["3. avgLockWaitTimePerPacket"] = (double)_octreeInboundPacketProcessor->getAverageLockWaitTimePerPacket(); timingArray2["3. avgLockWaitTimePerPacket"] = (double)_octreeInboundPacketProcessor->getAverageLockWaitTimePerPacket();
timingArray2["4. avgProcessTimePerElement"] = (double)_octreeInboundPacketProcessor->getAverageProcessTimePerElement(); timingArray2["4. avgProcessTimePerElement"] = (double)_octreeInboundPacketProcessor->getAverageProcessTimePerElement();
timingArray2["5. avgLockWaitTimePerElement"] = (double)_octreeInboundPacketProcessor->getAverageLockWaitTimePerElement(); timingArray2["5. avgLockWaitTimePerElement"] = (double)_octreeInboundPacketProcessor->getAverageLockWaitTimePerElement();
}
QJsonObject statsObject3; QJsonObject statsObject3;
statsObject3["data"] = dataArray2; statsObject3["data"] = dataArray2;