commit 5489b7a5b2f76725f4016846d57e1bad12e046e4
author Prathmesh Prabhu <pprabhu@chromium.org> Wed Apr 10 13:33:59 2013 -0700
committer ChromeBot <chrome-bot@google.com> Mon Apr 15 17:11:47 2013 -0700
tree 74f7658924d019d0345141b3398128f668ef3cf5
parent 3df47b77e70dab444efb15edab260e6e1f9fb955

shill: Add function to pretty-print result from ConnectionHealthChecker.

BUG=chromium:229982
TEST=build and run unit-tests.

Change-Id: I19d0b29bca278d28d7521871e03f0c1097f821d6
Reviewed-on: https://gerrit.chromium.org/gerrit/47789
Reviewed-by: Arman Uguray <armansito@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>

cellular.cc

diff --git a/cellular.cc b/cellular.cc
index c7510ec..c051a59 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -363,7 +363,8 @@
 
 void Cellular::OnConnectionHealthCheckerResult(
       ConnectionHealthChecker::Result result) {
-  SLOG(Cellular, 2) << __func__ << "(Result = " << result << ")";
+  SLOG(Cellular, 2) << __func__ << "(Result = "
+                    << ConnectionHealthChecker::ResultToString(result) << ")";
 
   if (result == ConnectionHealthChecker::kResultElongatedTimeWait ||
       result == ConnectionHealthChecker::kResultCongestedTxQueue) {

connection_health_checker.cc

diff --git a/connection_health_checker.cc b/connection_health_checker.cc
index 54b077b..ee635ee 100644
--- a/connection_health_checker.cc
+++ b/connection_health_checker.cc
@@ -119,6 +119,26 @@
   health_check_in_progress_ = false;
 }
 
+const char *ConnectionHealthChecker::ResultToString(
+    ConnectionHealthChecker::Result result) {
+  switch(result) {
+    case kResultUnknown:
+      return "Unknown";
+    case kResultInProgress:
+      return "InProgress";
+    case kResultConnectionFailure:
+      return "ConnectionFailure";
+    case kResultElongatedTimeWait:
+      return "ElongatedTimeWait";
+    case kResultCongestedTxQueue:
+      return "CongestedTxQueue";
+    case kResultSuccess:
+      return "Success";
+    default:
+      return "Invalid";
+  }
+}
+
 void ConnectionHealthChecker::SetupTcpConnection() {
   IPAddress ip = remote_ips_.front();
   SLOG(Connection, 3) << __func__ << ": Starting connection at "

connection_health_checker.h

diff --git a/connection_health_checker.h b/connection_health_checker.h
index f788878..22ace95 100644
--- a/connection_health_checker.h
+++ b/connection_health_checker.h
@@ -39,6 +39,7 @@
  public:
   typedef std::queue<IPAddress> IPAddressQueue;
 
+  // TODO(pprabhu): Rename kResultElongatedTimeWait to kResultTearDownFailure.
   enum Result {
     // There was some problem in the setup of ConnctionHealthChecker.
     // Could not attempt a tcp connection.
@@ -84,6 +85,8 @@
   // Calling Stop() on a Stop()ed health check is a no-op.
   virtual void Stop();
 
+  static const char *ResultToString(Result result);
+
   // Accessors.
   const IPAddressQueue &remote_ips() { return remote_ips_; }
   void set_run_data_test(bool val) { run_data_test_ = val; }

device.cc

diff --git a/device.cc b/device.cc
index 9151093..7bb92e3 100644
--- a/device.cc
+++ b/device.cc
@@ -670,8 +670,10 @@
 
 void Device::OnConnectionHealthCheckerResult(
     ConnectionHealthChecker::Result result) {
-  SLOG(Device, 2) << FriendlyName()
-      << ": ConnectionHealthChecker result: " << result;
+  SLOG(Device, 2)
+      << FriendlyName()
+      << ": ConnectionHealthChecker result: "
+      << ConnectionHealthChecker::ResultToString(result);
 }
 
 bool Device::RestartPortalDetection() {