summaryrefslogtreecommitdiffstats
path: root/adb/mutex_list.h
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2011-02-23 18:44:39 -0800
committerJP Abgrall <jpa@google.com>2011-02-23 18:49:00 -0800
commit0e7c4274c687446dbe30a814278d7a6b99da8c4e (patch)
tree1a186c36a574be64b986179f3504f9aebec99281 /adb/mutex_list.h
parent1e0582eba6cb07aa9311602dbed7d13bbab84588 (diff)
downloadsystem_core-0e7c4274c687446dbe30a814278d7a6b99da8c4e.zip
system_core-0e7c4274c687446dbe30a814278d7a6b99da8c4e.tar.gz
system_core-0e7c4274c687446dbe30a814278d7a6b99da8c4e.tar.bz2
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
Diffstat (limited to 'adb/mutex_list.h')
-rw-r--r--adb/mutex_list.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/adb/mutex_list.h b/adb/mutex_list.h
index 83f3e42..eebe0df 100644
--- a/adb/mutex_list.h
+++ b/adb/mutex_list.h
@@ -1,6 +1,4 @@
/* the list of mutexes used by addb */
-#ifndef __MUTEX_LIST_H
-#define __MUTEX_LIST_H
#ifndef ADB_MUTEX
#error ADB_MUTEX not defined when including this file
#endif
@@ -13,14 +11,4 @@ ADB_MUTEX(local_transports_lock)
#endif
ADB_MUTEX(usb_lock)
-// Sadly logging to /data/adb/adb-... is not thread safe.
-// After modifying adb.h::D() to count invocations:
-// DEBUG(jpa):0:Handling main()
-// DEBUG(jpa):1:[ usb_init - starting thread ]
-// (Oopsies, no :2:, and matching message is also gone.)
-// DEBUG(jpa):3:[ usb_thread - opening device ]
-// DEBUG(jpa):4:jdwp control socket started (10)
-ADB_MUTEX(D_lock)
-
#undef ADB_MUTEX
-#endif