From ce613d59fda3da951cb604cf8a2b779097c42508 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 1 Jul 2015 14:46:37 -0700 Subject: [PATCH] add inbound edit packet queue depth to entity server --- assignment-client/src/octree/OctreeServer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 43bc922c74..8efe1c39a0 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -627,6 +627,7 @@ bool OctreeServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url // display inbound packet stats statsString += QString().sprintf("%s Edit Statistics... [RESET]\r\n", getMyServerName()); + quint64 currentPacketsInQueue = _octreeInboundPacketProcessor->packetsToProcessCount(); quint64 averageTransitTimePerPacket = _octreeInboundPacketProcessor->getAverageTransitTimePerPacket(); quint64 averageProcessTimePerPacket = _octreeInboundPacketProcessor->getAverageProcessTimePerPacket(); quint64 averageLockWaitTimePerPacket = _octreeInboundPacketProcessor->getAverageLockWaitTimePerPacket(); @@ -637,6 +638,9 @@ bool OctreeServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url float averageElementsPerPacket = totalPacketsProcessed == 0 ? 0 : totalElementsProcessed / totalPacketsProcessed; + statsString += QString(" Current Inbound Packets Queue: %1 packets\r\n") + .arg(locale.toString((uint)currentPacketsInQueue).rightJustified(COLUMN_WIDTH, ' ')); + statsString += QString(" Total Inbound Packets: %1 packets\r\n") .arg(locale.toString((uint)totalPacketsProcessed).rightJustified(COLUMN_WIDTH, ' ')); statsString += QString(" Total Inbound Elements: %1 elements\r\n") @@ -1411,6 +1415,8 @@ void OctreeServer::sendStatsPacket() { static QJsonObject statsObject3; + statsObject3[baseName + QString(".3.inbound.data.1.packetQueue")] = + (double)_octreeInboundPacketProcessor->packetsToProcessCount(); statsObject3[baseName + QString(".3.inbound.data.1.totalPackets")] = (double)_octreeInboundPacketProcessor->getTotalPacketsProcessed(); statsObject3[baseName + QString(".3.inbound.data.2.totalElements")] =