commit fd88f9d6f6d8956d00370e66c4a1695ce9577cf5
author Chenbo Feng <fengc@google.com> Wed May 01 12:59:09 2019 -0700
committer Chenbo Feng <fengc@google.com> Wed May 01 23:06:27 2019 +0000
tree 432b33beeb05dd5b3cac99ad7c2a238bea4e93e6
parent 97c88db26633744fe953d30581e6eee55afc212c

Nits fix and comment update

Fix some nits from previous CLs and update the comments about the
TrafficController locking design

Bug: 130334320
Bug: 126620214
Test: Build
Change-Id: I9963f1c7944bdd6a759ccc45117aa88720ce6b9f

server/TrafficController.cpp

diff --git a/server/TrafficController.cpp b/server/TrafficController.cpp
index 548465b..9d9a3b5 100644
--- a/server/TrafficController.cpp
+++ b/server/TrafficController.cpp
@@ -73,12 +73,15 @@
 constexpr int kSockDiagMsgType = SOCK_DIAG_BY_FAMILY;
 constexpr int kSockDiagDoneMsgType = NLMSG_DONE;
 constexpr int PER_UID_STATS_ENTRIES_LIMIT = 500;
-constexpr int TOTAL_UID_STATS_ENTRIES_LIMIT = STATS_MAP_SIZE - 500;
+// Total stats entry limit is 90% of the stats map total size.
+constexpr int TOTAL_UID_STATS_ENTRIES_LIMIT = STATS_MAP_SIZE * 0.9;
 
 static_assert(BPF_PERMISSION_INTERNET == INetd::PERMISSION_INTERNET,
               "Mismatch between BPF and AIDL permissions: PERMISSION_INTERNET");
 static_assert(BPF_PERMISSION_UPDATE_DEVICE_STATS == INetd::PERMISSION_UPDATE_DEVICE_STATS,
               "Mismatch between BPF and AIDL permissions: PERMISSION_UPDATE_DEVICE_STATS");
+static_assert(STATS_MAP_SIZE - TOTAL_UID_STATS_ENTRIES_LIMIT > 100,
+              "The limit for stats map is to high, stats data may be lost due to overflow");
 
 #define FLAG_MSG_TRANS(result, flag, value)            \
     do {                                               \