commit f45b32346c1394d45fa03cb951f060dd978d4d94
author Ben Chan <benchan@chromium.org> Tue Oct 08 20:54:01 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Oct 09 19:10:48 2013 +0000
tree b38471d9705d123dba71985893d71c340d8e88fb
parent baf87071d410a58b62fdf78f7e27fb95dc0a032e

shill: cellular: Log modem state as readable string instead of value.

BUG=None
TEST=Verify that modem state is logged as readable string in /var/log/net.log.

Change-Id: I6f53faa2ed228f7661a592bf4f9ca8fb981873ee
Reviewed-on: https://chromium-review.googlesource.com/172370
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Thieu Le <thieule@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

cellular.cc

diff --git a/cellular.cc b/cellular.cc
index 6cd213e..bff6ad3 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -164,16 +164,55 @@
 // static
 string Cellular::GetStateString(State state) {
   switch (state) {
-    case kStateDisabled: return "CellularStateDisabled";
-    case kStateEnabled: return "CellularStateEnabled";
-    case kStateRegistered: return "CellularStateRegistered";
-    case kStateConnected: return "CellularStateConnected";
-    case kStateLinked: return "CellularStateLinked";
-    default: NOTREACHED();
+    case kStateDisabled:
+      return "CellularStateDisabled";
+    case kStateEnabled:
+      return "CellularStateEnabled";
+    case kStateRegistered:
+      return "CellularStateRegistered";
+    case kStateConnected:
+      return "CellularStateConnected";
+    case kStateLinked:
+      return "CellularStateLinked";
+    default:
+      NOTREACHED();
   }
   return StringPrintf("CellularStateUnknown-%d", state);
 }
 
+// static
+string Cellular::GetModemStateString(ModemState modem_state) {
+  switch (modem_state) {
+    case kModemStateUnknown:
+      return "CellularModemStateUnknown";
+    case kModemStateInitializing:
+      return "CellularModemStateInitializing";
+    case kModemStateLocked:
+      return "CellularModemStateLocked";
+    case kModemStateDisabled:
+      return "CellularModemStateDisabled";
+    case kModemStateDisabling:
+      return "CellularModemStateDisabling";
+    case kModemStateEnabling:
+      return "CellularModemStateEnabling";
+    case kModemStateEnabled:
+      return "CellularModemStateEnabled";
+    case kModemStateSearching:
+      return "CellularModemStateSearching";
+    case kModemStateRegistered:
+      return "CellularModemStateRegistered";
+    case kModemStateDisconnecting:
+      return "CellularModemStateDisconnecting";
+    case kModemStateConnecting:
+      return "CellularModemStateConnecting";
+    case kModemStateConnected:
+      return "CellularModemStateConnected";
+    default:
+      NOTREACHED();
+  }
+  return StringPrintf("CellularModemStateUnknown-%d", modem_state);
+}
+
 string Cellular::GetTechnologyFamily(Error *error) {
   return capability_->GetTypeString();
 }
@@ -740,7 +779,8 @@
 
 void Cellular::OnModemStateChanged(ModemState new_state) {
   ModemState old_state = modem_state_;
-  SLOG(Cellular, 2) << __func__ << ": " << old_state << " -> " << new_state;
+  SLOG(Cellular, 2) << __func__ << ": " << GetModemStateString(old_state)
+                    << " -> " << GetModemStateString(new_state);
   if (old_state == new_state) {
     SLOG(Cellular, 2) << "The new state matches the old state. Nothing to do.";
     return;