commit 4dd9b4d95eec9db5338fb9bf132f9bb8facf6cf4
author Elliott Hughes <enh@google.com> Mon Dec 12 18:29:24 2011 -0800
committer Elliott Hughes <enh@google.com> Tue Dec 13 08:23:08 2011 -0800
tree f9dc6f6e6a55acea3a08f1f568ae6900c1dd7dd1
parent 20a409c99a649a01cb7c65bd1089988445d8cdfd

Clean up verbose logging.

Change-Id: I6b01980e7145c4f8d25a5b50f620903f61a1b427

src/jdwp/jdwp_adb.cc

diff --git a/src/jdwp/jdwp_adb.cc b/src/jdwp/jdwp_adb.cc
index eb6eec2..eb49bce 100644
--- a/src/jdwp/jdwp_adb.cc
+++ b/src/jdwp/jdwp_adb.cc
@@ -121,7 +121,7 @@
 static bool startup(JdwpState* state, const JdwpOptions*) {
   JdwpNetState* netState;
 
-  LOG(VERBOSE) << "ADB transport startup";
+  VLOG(jdwp) << "ADB transport startup";
 
   state->netState = netState = new JdwpNetState;
   if (netState == NULL) {
@@ -248,14 +248,16 @@
         } while (ret < 0 && errno == EINTR);
 
         if (ret >= 0) {
-          LOG(VERBOSE) << StringPrintf("PID sent as '%.*s' to ADB", 4, buff);
+          VLOG(jdwp) << StringPrintf("PID sent as '%.*s' to ADB", 4, buff);
           break;
         }
 
         PLOG(ERROR) << "Weird, can't send JDWP process pid to ADB";
         return false;
       }
-      PLOG(VERBOSE) << "Can't connect to ADB control socket";
+      if (VLOG_IS_ON(jdwp)) {
+        PLOG(ERROR) << "Can't connect to ADB control socket";
+      }
 
       usleep( sleep_ms*1000 );
 
@@ -269,7 +271,7 @@
     }
   }
 
-  LOG(VERBOSE) << "trying to receive file descriptor from ADB";
+  VLOG(jdwp) << "trying to receive file descriptor from ADB";
   /* now we can receive a client file descriptor */
   netState->clientSock = receiveClientFd(netState);
   if (netState->shuttingDown) {
@@ -282,7 +284,7 @@
     }
     goto retry;
   } else {
-    LOG(VERBOSE) << "received file descriptor " << netState->clientSock << " from ADB";
+    VLOG(jdwp) << "received file descriptor " << netState->clientSock << " from ADB";
     netState->awaitingHandshake = 1;
     netState->inputCount = 0;
     return true;
@@ -308,7 +310,7 @@
     return;
   }
 
-  LOG(VERBOSE) << "+++ closed JDWP <-> ADB connection";
+  VLOG(jdwp) << "+++ closed JDWP <-> ADB connection";
 
   close(netState->clientSock);
   netState->clientSock = -1;
@@ -343,7 +345,7 @@
   }
 
   if (netState->wakeFds[1] >= 0) {
-    LOG(VERBOSE) << "+++ writing to wakePipe";
+    VLOG(jdwp) << "+++ writing to wakePipe";
     write(netState->wakeFds[1], "", 1);
   }
 }
@@ -462,7 +464,7 @@
     LOG(FATAL) << "reply?!";
   }
 
-  LOG(VERBOSE) << "----------";
+  VLOG(jdwp) << "----------";
 
   consumeBytes(netState, length);
   return true;
@@ -526,7 +528,7 @@
       }
 
       if (maxfd < 0) {
-        LOG(VERBOSE) << "+++ all fds are closed";
+        VLOG(jdwp) << "+++ all fds are closed";
         return false;
       }
 
@@ -580,7 +582,7 @@
           return true;
         } else if (readCount == 0) {
           /* EOF hit -- far end went away */
-          LOG(VERBOSE) << "+++ peer disconnected";
+          VLOG(jdwp) << "+++ peer disconnected";
           goto fail;
         } else {
           break;
@@ -619,7 +621,7 @@
 
     consumeBytes(netState, kMagicHandshakeLen);
     netState->awaitingHandshake = false;
-    LOG(VERBOSE) << "+++ handshake complete";
+    VLOG(jdwp) << "+++ handshake complete";
     return true;
   }
 
@@ -646,7 +648,7 @@
 
   if (netState->clientSock < 0) {
     /* can happen with some DDMS events */
-    LOG(VERBOSE) << "NOT sending request -- no debugger is attached";
+    VLOG(jdwp) << "NOT sending request -- no debugger is attached";
     return false;
   }
 
@@ -675,7 +677,7 @@
 
   if (netState->clientSock < 0) {
     /* can happen with some DDMS events */
-    LOG(VERBOSE) << "NOT sending request -- no debugger is attached";
+    VLOG(jdwp) << "NOT sending request -- no debugger is attached";
     return false;
   }