commit 3a272070fc318ef1a7a5a04e500483f1a7c629a8
author Pierre Imai <imaipi@google.com> Tue Apr 19 16:17:07 2016 +0900
committer Pierre Imai <imaipi@google.com> Thu Apr 28 17:28:21 2016 +0900
tree 50007c33c076de30837d3ba8470559b4c236e384
parent beedec3bc42d6f40a2c83a65522e85b5ff046f79

Add dumpsys support to ResolverController

BUG: 25731675

Change-Id: I1c715368b1f2d5e732528cd226b3f69792b75321

server/ResolverController.cpp

diff --git a/server/ResolverController.cpp b/server/ResolverController.cpp
index 20c9302..41913d3 100644
--- a/server/ResolverController.cpp
+++ b/server/ResolverController.cpp
@@ -33,8 +33,10 @@
 #include <resolv_params.h>
 #include <resolv_stats.h>
 
+#include <android-base/strings.h>
 #include <android/net/INetd.h>
 
+#include "DumpWriter.h"
 #include "ResolverController.h"
 #include "ResolverStats.h"
 
@@ -189,3 +191,57 @@
     (*params)[INetd::RESOLVER_PARAMS_MAX_SAMPLES] = res_params.max_samples;
     return 0;
 }
+
+void ResolverController::dump(DumpWriter& dw, unsigned netId) {
+    // No lock needed since Bionic's resolver locks all accessed data structures internally.
+    using android::net::ResolverStats;
+    std::vector<std::string> servers;
+    std::vector<std::string> domains;
+    __res_params params;
+    std::vector<ResolverStats> stats;
+    time_t now = time(nullptr);
+    int rv = getDnsInfo(netId, &servers, &domains, &params, &stats);
+    dw.incIndent();
+    if (rv != 0) {
+        dw.println("getDnsInfo() failed for netid %u", netId);
+    } else {
+        if (servers.empty()) {
+            dw.println("No DNS servers defined");
+        } else {
+            dw.println("DNS servers: # IP (total, successes, errors, timeouts, internal errors, "
+                    "RTT avg, last sample)");
+            dw.incIndent();
+            for (size_t i = 0 ; i < servers.size() ; ++i) {
+                if (i < stats.size()) {
+                    const ResolverStats& s = stats[i];
+                    int total = s.successes + s.errors + s.timeouts + s.internal_errors;
+                    if (total > 0) {
+                        int time_delta = (s.last_sample_time > 0) ? now - s.last_sample_time : -1;
+                        dw.println("%s (%d, %d, %d, %d, %d, %dms, %ds)%s", servers[i].c_str(),
+                                total, s.successes, s.errors, s.timeouts, s.internal_errors,
+                                s.rtt_avg, time_delta, s.usable ? "" : " BROKEN");
+                    } else {
+                        dw.println("%s <no data>", servers[i].c_str());
+                    }
+                } else {
+                    dw.println("%s <no stats>", servers[i].c_str());
+                }
+            }
+            dw.decIndent();
+        }
+        if (domains.empty()) {
+            dw.println("No search domains defined");
+        } else {
+            std::string domains_str = android::base::Join(domains, ", ");
+            dw.println("search domains: %s", domains_str.c_str());
+        }
+        if (params.sample_validity != 0) {
+            dw.println("DNS parameters: sample validity = %us, success threshold = %u%%, "
+                    "samples (min, max) = (%u, %u)", params.sample_validity,
+                    static_cast<unsigned>(params.success_threshold),
+                    static_cast<unsigned>(params.min_samples),
+                    static_cast<unsigned>(params.max_samples));
+        }
+    }
+    dw.decIndent();
+}