commit 0e7c4274c687446dbe30a814278d7a6b99da8c4e
author JP Abgrall <jpa@google.com> Wed Feb 23 18:44:39 2011 -0800
committer JP Abgrall <jpa@google.com> Wed Feb 23 18:49:00 2011 -0800
tree 1a186c36a574be64b986179f3504f9aebec99281
parent 1e0582eba6cb07aa9311602dbed7d13bbab84588

Revert "Fix adb hang when subprocess dies early."

This is for http://b/3482112 "adb interactions with device causing test harness failures".

This reverts commit 69c5c4c45bd4f1575ae8bdba13795297be7deb8c.

Change-Id: I630bf2e04d2ecf0223bd2af4e87136754ff880d3

adb/transport.c

diff --git a/adb/transport.c b/adb/transport.c
index 2d678b2..2baf340 100644
--- a/adb/transport.c
+++ b/adb/transport.c
@@ -35,30 +35,24 @@
 ADB_MUTEX_DEFINE( transport_lock );
 
 #if ADB_TRACE
-#define MAX_DUMP_HEX_LEN 16
 static void  dump_hex( const unsigned char*  ptr, size_t  len )
 {
     int  nn, len2 = len;
-    // Build a string instead of logging each character.
-    // MAX chars in 2 digit hex, one space, MAX chars, one '\0'.
-    char buffer[MAX_DUMP_HEX_LEN *2 + 1 + MAX_DUMP_HEX_LEN + 1 ], *pb = buffer;
 
-    if (len2 > MAX_DUMP_HEX_LEN) len2 = MAX_DUMP_HEX_LEN;
+    if (len2 > 16) len2 = 16;
 
-    for (nn = 0; nn < len2; nn++) {
-        sprintf(pb, "%02x", ptr[nn]);
-        pb += 2;
-    }
-    sprintf(pb++, " ");
+    for (nn = 0; nn < len2; nn++)
+        D("%02x", ptr[nn]);
+    D("  ");
 
     for (nn = 0; nn < len2; nn++) {
         int  c = ptr[nn];
         if (c < 32 || c > 127)
             c = '.';
-        *pb++ =  c;
+        D("%c", c);
     }
-    *pb++ = '\0';
-    DR("%s\n", buffer);
+    D("\n");
+    fflush(stdout);
 }
 #endif
 
@@ -198,7 +192,6 @@
 static void transport_socket_events(int fd, unsigned events, void *_t)
 {
     atransport *t = _t;
-    D("transport_socket_events(fd=%d, events=%04x,...)\n", fd, events);
     if(events & FDE_READ){
         apacket *p = 0;
         if(read_packet(fd, t->serial, &p)){
@@ -228,8 +221,8 @@
     print_packet("send", p);
 
     if (t == NULL) {
-        D("Transport is null \n");
         fatal_errno("Transport is null");
+        D("Transport is null \n");
     }
 
     if(write_packet(t->transport_socket, t->serial, &p)){
@@ -1076,3 +1069,4 @@
         return 0;
     }
 }
+