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_socket.cc

diff --git a/src/jdwp/jdwp_socket.cc b/src/jdwp/jdwp_socket.cc
index b832133..d28c1da 100644
--- a/src/jdwp/jdwp_socket.cc
+++ b/src/jdwp/jdwp_socket.cc
@@ -222,7 +222,7 @@
 
   /* if we might be sitting in select, kick us loose */
   if (netState->wakePipe[1] >= 0) {
-    LOG(VERBOSE) << "+++ writing to wakePipe";
+    VLOG(jdwp) << "+++ writing to wakePipe";
     (void) write(netState->wakePipe[1], "", 1);
   }
 }
@@ -353,7 +353,9 @@
       // When we call shutdown() on the socket, accept() returns with
       // EINVAL.  Don't gripe about it.
       if (errno == EINVAL) {
-        PLOG(VERBOSE) << "accept failed";
+        if (VLOG_IS_ON(jdwp)) {
+          PLOG(ERROR) << "accept failed";
+        }
       } else {
         PLOG(ERROR) << "accept failed";
         return false;
@@ -363,13 +365,13 @@
 
   netState->remoteAddr = addr.addrInet.sin_addr;
   netState->remotePort = ntohs(addr.addrInet.sin_port);
-  LOG(VERBOSE) << "+++ accepted connection from " << inet_ntoa(netState->remoteAddr) << ":" << netState->remotePort;
+  VLOG(jdwp) << "+++ accepted connection from " << inet_ntoa(netState->remoteAddr) << ":" << netState->remotePort;
 
   netState->clientSock = sock;
   netState->awaitingHandshake = true;
   netState->inputCount = 0;
 
-  LOG(VERBOSE) << "Setting TCP_NODELAY on accepted socket";
+  VLOG(jdwp) << "Setting TCP_NODELAY on accepted socket";
   setNoDelay(netState->clientSock);
 
   if (pipe(netState->wakePipe) < 0) {
@@ -476,7 +478,7 @@
     return;
   }
 
-  LOG(VERBOSE) << "+++ closed connection to " << inet_ntoa(netState->remoteAddr) << ":" << netState->remotePort;
+  VLOG(jdwp) << "+++ closed connection to " << inet_ntoa(netState->remoteAddr) << ":" << netState->remotePort;
 
   close(netState->clientSock);
   netState->clientSock = -1;
@@ -543,7 +545,7 @@
 
   dataLen = length - (buf - packetBuf);
 
-  LOG(VERBOSE) << StringPrintf("--- %s: dataLen=%u id=0x%08x flags=0x%02x cmd=%d/%d",
+  VLOG(jdwp) << StringPrintf("--- %s: dataLen=%u id=0x%08x flags=0x%02x cmd=%d/%d",
       reply ? "reply" : "req", dataLen, id, flags, cmdSet, cmd);
   if (dataLen > 0) {
     HexDump(buf, dataLen);
@@ -608,7 +610,7 @@
     DCHECK(false);
   }
 
-  LOG(VERBOSE) << "----------";
+  VLOG(jdwp) << "----------";
 
   consumeBytes(netState, length);
   return true;
@@ -653,7 +655,7 @@
       }
 
       if (maxfd < 0) {
-        LOG(VERBOSE) << "+++ all fds are closed";
+        VLOG(jdwp) << "+++ all fds are closed";
         return false;
       }
 
@@ -769,7 +771,7 @@
 
     consumeBytes(netState, kMagicHandshakeLen);
     netState->awaitingHandshake = false;
-    LOG(VERBOSE) << "+++ handshake complete";
+    VLOG(jdwp) << "+++ handshake complete";
     return true;
   }
 
@@ -797,7 +799,7 @@
   /*dumpPacket(expandBufGetBuffer(pReq));*/
   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;
   }
 
@@ -825,7 +827,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;
   }