From 40037bee55d063ae1f81c3811e9c7623370f37c5 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Wed, 22 Feb 2017 23:28:40 -0800
Subject: [PATCH] added some stats for the random drops

---
 assignment-client/src/avatars/AvatarMixer.cpp      |  8 +++++++-
 assignment-client/src/avatars/AvatarMixerSlave.cpp | 10 +++++++---
 assignment-client/src/avatars/AvatarMixerSlave.h   |  6 ++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index a347b5ef47..a90fdb100c 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -506,6 +506,9 @@ void AvatarMixer::sendStatsPacket() {
         float averageOthersIncluded = averageNodes ? stats.numOthersIncluded / averageNodes : 0.0f;
         slaveObject["sent_6_averageOthersIncluded"] = TIGHT_LOOP_STAT(averageOthersIncluded);
 
+        float averageRandomDrops = averageNodes ? stats.randomDrops / averageNodes : 0.0f;
+        slaveObject["sent_7_averageRandomDrops"] = TIGHT_LOOP_STAT(averageRandomDrops);
+
         slaveObject["timing_1_processIncomingPackets"] = TIGHT_LOOP_STAT_UINT64(stats.processIncomingPacketsElapsedTime);
         slaveObject["timing_2_ignoreCalculation"] = TIGHT_LOOP_STAT_UINT64(stats.ignoreCalculationElapsedTime);
         slaveObject["timing_3_toByteArray"] = TIGHT_LOOP_STAT_UINT64(stats.toByteArrayElapsedTime);
@@ -533,9 +536,12 @@ void AvatarMixer::sendStatsPacket() {
     float averageOutboundAvatarKbps = averageNodes ? ((aggregateStats.numBytesSent / secondsSinceLastStats) / BYTES_PER_KILOBIT) / averageNodes : 0.0f;
     slavesAggregatObject["sent_5_averageOutboundAvatarKbps"] = averageOutboundAvatarKbps;
 
+    float averageRandomDrops = averageNodes ? aggregateStats.randomDrops / averageNodes : 0.0f;
+    slavesAggregatObject["sent_7_averageRandomDrops"] = TIGHT_LOOP_STAT(averageRandomDrops);
+
     float averageOthersIncluded = averageNodes ? aggregateStats.numOthersIncluded / averageNodes : 0.0f;
     slavesAggregatObject["sent_6_averageOthersIncluded"] = TIGHT_LOOP_STAT(averageOthersIncluded);
-    
+
     slavesAggregatObject["timing_1_processIncomingPackets"] = TIGHT_LOOP_STAT_UINT64(aggregateStats.processIncomingPacketsElapsedTime);
     slavesAggregatObject["timing_2_ignoreCalculation"] = TIGHT_LOOP_STAT_UINT64(aggregateStats.ignoreCalculationElapsedTime);
     slavesAggregatObject["timing_3_toByteArray"] = TIGHT_LOOP_STAT_UINT64(aggregateStats.toByteArrayElapsedTime);
diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp
index 0004afa97c..5073aab934 100644
--- a/assignment-client/src/avatars/AvatarMixerSlave.cpp
+++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp
@@ -332,15 +332,19 @@ void AvatarMixerSlave::broadcastAvatarData(const SharedNodePointer& node) {
                 //
                 // NOTE: If the recieving node is in "PAL mode" then it's asked to get things even that
                 //       are out of view, this also appears to disable this random distribution.
+                //
+                // FIXME - This approach for managing the outbound bandwidth is less than ideal,
+                //         it would be better to more directly budget the number of bytes to send
+                //         per frame and simply exit the sorted avatar list once that budget is
+                //         surpassed. We will work on that next. [BHG 2/22/17]
                 if (distanceToAvatar != 0.0f
                     && !getsOutOfView
-                    && distribution(generator) > (nodeData->getFullRateDistance() / distanceToAvatar) /// FIX ME... we don't want to do this random stuff
+                    && distribution(generator) > (nodeData->getFullRateDistance() / distanceToAvatar)
                 ) {
-
                     quint64 endAvatarDataPacking = usecTimestampNow();
                     _stats.avatarDataPackingElapsedTime += (endAvatarDataPacking - startAvatarDataPacking);
                     shouldConsider = false;
-                    //qDebug() << "shouldConsider = false ... line:" << __LINE__;
+                    _stats.randomDrops++;
                 }
 
                 if (shouldConsider) {
diff --git a/assignment-client/src/avatars/AvatarMixerSlave.h b/assignment-client/src/avatars/AvatarMixerSlave.h
index b1a5b56c4f..50ae4570b5 100644
--- a/assignment-client/src/avatars/AvatarMixerSlave.h
+++ b/assignment-client/src/avatars/AvatarMixerSlave.h
@@ -25,6 +25,8 @@ public:
     int numBytesSent { 0 };
     int numIdentityPackets { 0 };
     int numOthersIncluded { 0 };
+    int randomDrops { 0 };
+
     quint64 ignoreCalculationElapsedTime { 0 };
     quint64 avatarDataPackingElapsedTime { 0 };
     quint64 packetSendingElapsedTime { 0 };
@@ -43,6 +45,8 @@ public:
         numBytesSent = 0;
         numIdentityPackets = 0;
         numOthersIncluded = 0;
+        randomDrops = 0;
+
         ignoreCalculationElapsedTime = 0;
         avatarDataPackingElapsedTime = 0;
         packetSendingElapsedTime = 0;
@@ -60,6 +64,8 @@ public:
         numBytesSent += rhs.numBytesSent;
         numIdentityPackets += rhs.numIdentityPackets;
         numOthersIncluded += rhs.numOthersIncluded;
+        randomDrops += rhs.randomDrops;
+
         ignoreCalculationElapsedTime += rhs.ignoreCalculationElapsedTime;
         avatarDataPackingElapsedTime += rhs.avatarDataPackingElapsedTime;
         packetSendingElapsedTime += rhs.packetSendingElapsedTime;