diff options
| author | JP Abgrall <jpa@google.com> | 2011-02-22 18:29:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-22 18:29:45 -0800 |
| commit | 1e0582eba6cb07aa9311602dbed7d13bbab84588 (patch) | |
| tree | b3a955b8b8b3ade64cf685110cba6009c6ae4091 /adb/mutex_list.h | |
| parent | 012cf8f2de3cf48645e05209123d11bdb0ed8de7 (diff) | |
| parent | 69c5c4c45bd4f1575ae8bdba13795297be7deb8c (diff) | |
| download | system_core-1e0582eba6cb07aa9311602dbed7d13bbab84588.zip system_core-1e0582eba6cb07aa9311602dbed7d13bbab84588.tar.gz system_core-1e0582eba6cb07aa9311602dbed7d13bbab84588.tar.bz2 | |
Merge "Fix adb hang when subprocess dies early."
Diffstat (limited to 'adb/mutex_list.h')
| -rw-r--r-- | adb/mutex_list.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/adb/mutex_list.h b/adb/mutex_list.h index eebe0df..83f3e42 100644 --- a/adb/mutex_list.h +++ b/adb/mutex_list.h @@ -1,4 +1,6 @@ /* 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 @@ -11,4 +13,14 @@ 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 |