提交: 574645c708ddd7794de10588eaba08c956dec783 - system-core (git)

system/core

Commit MetaInfo

• 修订版: 574645c708ddd7794de10588eaba08c956dec783 (tree)
• 时间: 2012-07-11 16:35:57
• 作者: Jack Ren <jack.ren@inte...>
• Commiter: Chih-Wei Huang

Log Message

adb: usb_windows: fix adb connection lost issue

Windows adb connection could be lost if the target
side kernel enables the kmemleak.

The root cause is that kmemleak downgrades USB
performance, and lead to Windows adb host application
timeout because usb_write()/usb_read()'s timeout time is
very short. That issue is not reproducible in Linux
host because its usb_write() timeout is 5s and usb_read()
is blocked until return:

usb_write() usb_read()

Linux 5000ms blocked until return
Windows 500+len*8 ms 500+len*8 ms

To fix that issue, extend the Windows adb host usb_write
timeout time to 5 seconds and usb_read() as a blocked routine:

usb_write() usb_read()

Windows 5000ms blocked until return

Change-Id: If54e2b4c396a5a06318c0ee0b3326a00e7661fbc
Signed-off-by: Yu Wang <[e-mail]>
Signed-off-by: Jin Can Zhuang <[e-mail]>
Signed-off-by: Jack Ren <[e-mail]>
Signed-off-by: Bruce Beare <[e-mail]>

更改概述

• modified: adb/usb_windows.c

差异

--- a/adb/usb_windows.c
+++ b/adb/usb_windows.c
@@ -255,7 +255,7 @@ usb_handle* do_usb_open(const wchar_t* interface_name) {
 }
 
 int usb_write(usb_handle* handle, const void* data, int len) {
-  unsigned long time_out = 500 + len * 8;
+  unsigned long time_out = 5000;
   unsigned long written = 0;
   int ret;
 
@@ -300,7 +300,7 @@ int usb_write(usb_handle* handle, const void* data, int len) {
 }
 
 int usb_read(usb_handle *handle, void* data, int len) {
-  unsigned long time_out = 500 + len * 8;
+  unsigned long time_out = 0;
   unsigned long read = 0;
   int ret;
 
@@ -322,7 +322,7 @@ int usb_read(usb_handle *handle, void* data, int len) {
 
         if (len == 0)
           return 0;
-      } else if (saved_errno != ERROR_SEM_TIMEOUT) {
+      } else {
         // assume ERROR_INVALID_HANDLE indicates we are disconnected
         if (saved_errno == ERROR_INVALID_HANDLE)
           usb_kick(handle);