commit 31e43e10b17cb20321b13e5379060186778a4b7b
author Bernie Innocenti <codewiz@google.com> Tue Sep 25 15:28:12 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Tue Sep 25 15:31:01 2018 +0900
tree 2a280ef4a02e2051c7e7bae967f82b39e04a349e
parent 518ef8bc734692cc0de24bfcd572b91c364c7fee

dns_tls_test: hush verbose logging

This test was generating over 100K lines of log spam. Switched to
ALOGV(), which can be enabled via '#define LOG_NDEBUG 0'.

Test: atest netd_integration_test
Change-Id: I7990447f73eaef21840b4a410897b80716a4aa40

tests/dns_tls_test.cpp

diff --git a/tests/dns_tls_test.cpp b/tests/dns_tls_test.cpp
index b18fcff..cd0a2a8 100644
--- a/tests/dns_tls_test.cpp
+++ b/tests/dns_tls_test.cpp
@@ -15,6 +15,7 @@
  */
 
 #define LOG_TAG "dns_tls_test"
+#define LOG_NDEBUG 1  // Set to 0 to enable verbose debug logging
 
 #include <gtest/gtest.h>
 
@@ -221,7 +222,7 @@
     static bool sReverse;
 
     bool query(uint16_t id, const Slice query) override {
-        ALOGD("FakeSocketDelay got query with ID %d", int(id));
+        ALOGV("FakeSocketDelay got query with ID %d", int(id));
         std::lock_guard guard(mLock);
         // Check for duplicate IDs.
         EXPECT_EQ(0U, mIds.count(id));
@@ -230,7 +231,7 @@
         // Store response.
         mResponses.push_back(make_echo(id, query));
 
-        ALOGD("Up to %zu out of %zu queries", mResponses.size(), sDelay);
+        ALOGV("Up to %zu out of %zu queries", mResponses.size(), sDelay);
         if (mResponses.size() == sDelay) {
             std::thread(&FakeSocketDelay::sendResponses, this).detach();
         }
@@ -460,31 +461,31 @@
         : mObserver(observer), mQueries(0) {}
     ~FakeSocketLimited() {
         {
-            ALOGD("~FakeSocketLimited acquiring mLock");
+            ALOGV("~FakeSocketLimited acquiring mLock");
             std::lock_guard guard(mLock);
-            ALOGD("~FakeSocketLimited acquired mLock");
+            ALOGV("~FakeSocketLimited acquired mLock");
             for (auto& thread : mThreads) {
-                ALOGD("~FakeSocketLimited joining response thread");
+                ALOGV("~FakeSocketLimited joining response thread");
                 thread.join();
-                ALOGD("~FakeSocketLimited joined response thread");
+                ALOGV("~FakeSocketLimited joined response thread");
             }
             mThreads.clear();
         }
 
         if (mCloser) {
-            ALOGD("~FakeSocketLimited joining closer thread");
+            ALOGV("~FakeSocketLimited joining closer thread");
             mCloser->join();
-            ALOGD("~FakeSocketLimited joined closer thread");
+            ALOGV("~FakeSocketLimited joined closer thread");
         }
     }
     bool query(uint16_t id, const Slice query) override {
-        ALOGD("FakeSocketLimited::query acquiring mLock");
+        ALOGV("FakeSocketLimited::query acquiring mLock");
         std::lock_guard guard(mLock);
-        ALOGD("FakeSocketLimited::query acquired mLock");
+        ALOGV("FakeSocketLimited::query acquired mLock");
         ++mQueries;
 
         if (mQueries <= sLimit) {
-            ALOGD("size %zu vs. limit of %zu", query.size(), sMaxSize);
+            ALOGV("size %zu vs. limit of %zu", query.size(), sMaxSize);
             if (query.size() <= sMaxSize) {
                 // Return the response immediately (asynchronously).
                 mThreads.emplace_back(&IDnsTlsSocketObserver::onResponse, mObserver, make_echo(id, query));
@@ -499,13 +500,13 @@
   private:
     void sendClose() {
         {
-            ALOGD("FakeSocketLimited::sendClose acquiring mLock");
+            ALOGV("FakeSocketLimited::sendClose acquiring mLock");
             std::lock_guard guard(mLock);
-            ALOGD("FakeSocketLimited::sendClose acquired mLock");
+            ALOGV("FakeSocketLimited::sendClose acquired mLock");
             for (auto& thread : mThreads) {
-                ALOGD("FakeSocketLimited::sendClose joining response thread");
+                ALOGV("FakeSocketLimited::sendClose joining response thread");
                 thread.join();
-                ALOGD("FakeSocketLimited::sendClose joined response thread");
+                ALOGV("FakeSocketLimited::sendClose joined response thread");
             }
             mThreads.clear();
         }