commit b31fd69b1683915e73006fcc5f45b15c7ed5b941
author Erik Kline <ek@google.com> Wed Jun 06 20:50:11 2018 +0900
committer Erik Kline <ek@google.com> Tue Jul 10 16:05:04 2018 +0900
tree 4bdbdf01596650d152ceef9c1f7a9b4ed745c859
parent 4e19cb8648df44b1642fbe13890e1f76fc938588

Add basic logging infrastructure for bugreports

Test: as follows
    - built, flashed, booted
    - "adb shell dumpsys netd" shows logs
    - tests/runtests.sh passes
Change-Id: I0e44da7f9a9cc53074ffc396b958e9e2dbcd2603

server/TcpSocketMonitor.cpp

diff --git a/server/TcpSocketMonitor.cpp b/server/TcpSocketMonitor.cpp
index 57f1fda..864c3be 100644
--- a/server/TcpSocketMonitor.cpp
+++ b/server/TcpSocketMonitor.cpp
@@ -100,7 +100,7 @@
     std::lock_guard<std::mutex> guard(mLock);
 
     dw.println("TcpSocketMonitor");
-    dw.incIndent();
+    ScopedIndent tcpSocketMonitorDetails(dw);
 
     const auto now = steady_clock::now();
     const auto d = duration_cast<milliseconds>(now - mLastPoll);
@@ -110,25 +110,25 @@
     if (!mNetworkStats.empty()) {
         dw.blankline();
         dw.println("Network stats:");
-        for (auto const& stats : mNetworkStats) {
+        for (const auto& stats : mNetworkStats) {
             if (stats.second.nSockets == 0) {
                 continue;
             }
-            dw.println("netId=%d sent=%d lost=%d rttMs=%gms sentAckDiff=%gms",
-                    stats.first,
-                    stats.second.sent,
-                    stats.second.lost,
-                    stats.second.rttUs / 1000.0 / stats.second.nSockets,
-                    stats.second.sentAckDiffMs / stats.second.nSockets);
+            dw.println("netId=%d sent=%d lost=%d rttMs=%gms sentAckDiff=%dms",
+                       stats.first,
+                       stats.second.sent,
+                       stats.second.lost,
+                       stats.second.rttUs / 1000.0 / stats.second.nSockets,
+                       stats.second.sentAckDiffMs / stats.second.nSockets);
         }
     }
 
     if (!mSocketEntries.empty()) {
         dw.blankline();
         dw.println("Socket entries:");
-        for (auto const& stats : mSocketEntries) {
-            dw.println("netId=%u uid=%u cookie=%ld",
-                    stats.second.mark.netId, stats.second.uid, stats.first);
+        for (const auto& stats : mSocketEntries) {
+            dw.println("netId=%u uid=%u cookie=%llu",
+                    stats.second.mark.netId, stats.second.uid, (unsigned long long) stats.first);
         }
     }
 
@@ -147,8 +147,6 @@
     } else {
         ALOGE("Error opening sock diag for dumping TCP socket info");
     }
-
-    dw.decIndent();
 }
 
 void TcpSocketMonitor::setPollingInterval(milliseconds nextSleepDurationMs) {