#3644 Fix new logging of packet drops hitting performance #2

Misunderstood how mDroppedPackets worked, clear out what's not needed

6 files changed, 2 insertions, 7 deletions

diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
index 470398152c..da3c502e9d 100644
--- a/indra/llmessage/llpacketring.cpp
+++ b/indra/llmessage/llpacketring.cpp
@@ -304,6 +304,8 @@ S32 LLPacketRing::drainSocket(S32 socket)
     S32 num_dropped_packets = (num_loops - 1 + old_num_packets) - mNumBufferedPackets;
     if (num_dropped_packets > 0)
     {
+        // It will eventually be accounted by mDroppedPackets
+        // and mPacketsLost, but track it here for logging purposes.
         mNumDroppedPackets += num_dropped_packets;
     }
     return (S32)(mNumBufferedPackets);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c351f63e85..e8546d422b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3413,7 +3413,6 @@ LLSD LLAppViewer::getViewerInfo() const
         info["PACKETS_LOST"] = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_LOST);
         info["PACKETS_IN"] = packets_in;
         info["PACKETS_PCT"] = 100.f*info["PACKETS_LOST"].asReal() / info["PACKETS_IN"].asReal();
-        info["PACKETS_DROPPED"] = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_DROPPED);
     }
 
     if (mServerReleaseNotesURL.empty())
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 4f52ab644c..73aabf49d1 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -121,7 +121,6 @@ LLTrace::CountStatHandle<>  FPS("FPS", "Frames rendered"),
                             PACKETS_IN("Packets In", "Packets received"),
                             PACKETS_LOST("packetsloststat", "Packets lost"),
                             PACKETS_OUT("packetsoutstat", "Packets sent"),
-                            PACKETS_DROPPED("packetsdropped", "Packets dropped"),
                             TEXTURE_PACKETS("texturepacketsstat", "Texture data packets received"),
                             CHAT_COUNT("chatcount", "Chat messages sent"),
                             IM_COUNT("imcount", "IMs sent"),
@@ -648,7 +647,6 @@ void send_viewer_stats(bool include_preferences)
 
     fail["send_packet"] = (S32) gMessageSystem->mSendPacketFailureCount;
     fail["dropped"] = (S32) gMessageSystem->mDroppedPackets;
-    fail["ring_dropped"] = (S32)gMessageSystem->mPacketRing.getNumDroppedPackets();
     fail["resent"] = (S32) gMessageSystem->mResentPackets;
     fail["failed_resends"] = (S32) gMessageSystem->mFailedResendPackets;
     fail["off_circuit"] = (S32) gMessageSystem->mOffCircuitPackets;
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index 4cab2b48a5..8aed1c537e 100644
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
@@ -119,7 +119,6 @@ extern LLTrace::CountStatHandle<>           FPS,
                                             PACKETS_IN,
                                             PACKETS_LOST,
                                             PACKETS_OUT,
-                                            PACKETS_DROPPED,
                                             TEXTURE_PACKETS,
                                             CHAT_COUNT,
                                             IM_COUNT,
diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp
index dce85bcb03..b0a00c29a4 100644
--- a/indra/newview/llviewerthrottle.cpp
+++ b/indra/newview/llviewerthrottle.cpp
@@ -304,7 +304,6 @@ void LLViewerThrottle::updateDynamicThrottle()
     }
     mUpdateTimer.reset();
 
-    // Todo: account for dropped packets from LLPacketRing (or make the thing threaded)
     LLUnit<F32, LLUnits::Percent> mean_packets_lost = LLViewerStats::instance().getRecording().getMean(LLStatViewer::PACKETS_LOST_PERCENT);
     if (mean_packets_lost > TIGHTEN_THROTTLE_THRESHOLD)
     {
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index a1eed0340b..899733ccc3 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -795,7 +795,6 @@ void LLWorld::updateNetStats()
     S32 packets_in = gMessageSystem->mPacketsIn - mLastPacketsIn;
     S32 packets_out = gMessageSystem->mPacketsOut - mLastPacketsOut;
     S32 packets_lost = gMessageSystem->mDroppedPackets - mLastPacketsLost;
-    S32 ring_packets_dropped = gMessageSystem->mPacketRing.getNumDroppedPackets();
 
     F64Bits actual_in_bits(gMessageSystem->mPacketRing.getAndResetActualInBits());
     F64Bits actual_out_bits(gMessageSystem->mPacketRing.getAndResetActualOutBits());
@@ -806,7 +805,6 @@ void LLWorld::updateNetStats()
     add(LLStatViewer::PACKETS_IN, packets_in);
     add(LLStatViewer::PACKETS_OUT, packets_out);
     add(LLStatViewer::PACKETS_LOST, packets_lost);
-    add(LLStatViewer::PACKETS_DROPPED, ring_packets_dropped);
 
     F32 total_packets_in = (F32)LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN);
     if (total_packets_in > 0.f)