commit 465331c22590ed6f8edfe5ac52149dbaf6974cf1
author mukesh agrawal <quiche@chromium.org> Wed May 30 11:26:11 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed May 30 14:16:01 2012 -0700
tree 799c3124c0adce7598e9195fa994d63af7c91d05
parent 6b34a84a8680694a8941dab2ff9c4914dcdae408

shill: add more logging

When logging a GetProperties call, include the name of the device.
Also, when filling in the GetProperties reply, log the names of the
properties as we process them.

BUG=chromium-os:30096
TEST=unit tests

Change-Id: I697343bd99ab21bcea1f1577ab562477758e5682
Reviewed-on: https://gerrit.chromium.org/gerrit/24065
Commit-Ready: mukesh agrawal <quiche@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>

dbus_adaptor.cc

diff --git a/dbus_adaptor.cc b/dbus_adaptor.cc
index 930450f..5a2f855 100644
--- a/dbus_adaptor.cc
+++ b/dbus_adaptor.cc
@@ -98,24 +98,32 @@
   Error e;
   {
     ReadablePropertyConstIterator<bool> it = store.GetBoolPropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing bool " << it.Key();
       (*out)[it.Key()] = BoolToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<int16> it = store.GetInt16PropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing int16 " << it.Key();
       (*out)[it.Key()] = Int16ToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<int32> it = store.GetInt32PropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing int32 " << it.Key();
       (*out)[it.Key()] = Int32ToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<KeyValueStore> it =
         store.GetKeyValueStorePropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing KeyValueStore " << it.Key();
       (*out)[it.Key()] = KeyValueStoreToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<RpcIdentifiers> it =
@@ -128,51 +136,67 @@
            ++in) {
         rpc_identifiers_as_paths.push_back(*in);
       }
+      SLOG(DBus, 5) << __func__ << " serializing RpcIdentifiers " << it.Key();
       (*out)[it.Key()] = PathsToVariant(rpc_identifiers_as_paths);
     }
   }
   {
     ReadablePropertyConstIterator<string> it = store.GetStringPropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing string " << it.Key();
       (*out)[it.Key()] = StringToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<Stringmap> it =
         store.GetStringmapPropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing Stringmap " << it.Key();
       (*out)[it.Key()]= StringmapToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<Stringmaps> it =
         store.GetStringmapsPropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing Stringmaps " << it.Key();
       (*out)[it.Key()]= StringmapsToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<Strings> it =
         store.GetStringsPropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing Strings " << it.Key();
       (*out)[it.Key()] = StringsToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<uint8> it = store.GetUint8PropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing uint8 " << it.Key();
       (*out)[it.Key()] = ByteToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<uint16> it = store.GetUint16PropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing uint16 " << it.Key();
       (*out)[it.Key()] = Uint16ToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<uint32> it = store.GetUint32PropertiesIter();
-    for ( ; !it.AtEnd(); it.Advance())
+    for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing uint32 " << it.Key();
       (*out)[it.Key()] = Uint32ToVariant(it.Value(&e));
+    }
   }
   {
     ReadablePropertyConstIterator<RpcIdentifier> it =
         store.GetRpcIdentifierPropertiesIter();
     for ( ; !it.AtEnd(); it.Advance()) {
+      SLOG(DBus, 5) << __func__ << " serializing RpcIdentifier " << it.Key();
       (*out)[it.Key()] = PathToVariant(it.Value(&e));
     }
   }