diff options
author | Josh Gao <jmgao@google.com> | 2017-07-26 11:06:55 -0700 |
---|---|---|
committer | Josh Gao <jmgao@google.com> | 2017-07-27 00:34:31 -0700 |
commit | 5e29eb9f63d0336cff3c9d34adf6a36542dc4aec (patch) | |
tree | 8fa819a4216090d918fb435fbe57ccdb9b653d2f | |
parent | 7f617cbc4d8025d0ff634b4dcd8c5c1be573b841 (diff) | |
download | adb-5e29eb9f63d0336cff3c9d34adf6a36542dc4aec.tar.gz |
adbd: add logging to troubleshoot usb issues.
Bug: http://b/63899881
Bug: http://b/63901259
Bug: http://b/63904904
Test: treehugger
Change-Id: Ifbc3caa6b416093bf8e127194003747c910352dc
(cherry picked from commit 184f571cfdf544963cff7450451dff081aa6e626)
-rw-r--r-- | adbd_auth.cpp | 4 | ||||
-rw-r--r-- | daemon/usb.cpp | 15 | ||||
-rw-r--r-- | transport_usb.cpp | 14 |
3 files changed, 19 insertions, 14 deletions
diff --git a/adbd_auth.cpp b/adbd_auth.cpp index b5f87be..3488ad1 100644 --- a/adbd_auth.cpp +++ b/adbd_auth.cpp @@ -217,8 +217,8 @@ void send_auth_request(atransport* t) { send_packet(p, t); } -void adbd_auth_verified(atransport *t) -{ +void adbd_auth_verified(atransport* t) { + LOG(INFO) << "adb client authorized"; handle_online(t); send_connect(t); } diff --git a/daemon/usb.cpp b/daemon/usb.cpp index d3b2f3d..0f92282 100644 --- a/daemon/usb.cpp +++ b/daemon/usb.cpp @@ -235,6 +235,8 @@ static const struct { }; bool init_functionfs(struct usb_handle* h) { + LOG(INFO) << "initializing functionfs"; + ssize_t ret; struct desc_v1 v1_descriptor; struct desc_v2 v2_descriptor; @@ -255,10 +257,10 @@ bool init_functionfs(struct usb_handle* h) { v2_descriptor.os_desc = os_desc_compat; if (h->control < 0) { // might have already done this before - D("OPENING %s", USB_FFS_ADB_EP0); + LOG(INFO) << "opening control endpoint " << USB_FFS_ADB_EP0; h->control = adb_open(USB_FFS_ADB_EP0, O_RDWR); if (h->control < 0) { - D("[ %s: cannot open control endpoint: errno=%d]", USB_FFS_ADB_EP0, errno); + PLOG(ERROR) << "cannot open control endpoint " << USB_FFS_ADB_EP0; goto err; } @@ -289,13 +291,13 @@ bool init_functionfs(struct usb_handle* h) { h->bulk_out = adb_open(USB_FFS_ADB_OUT, O_RDWR); if (h->bulk_out < 0) { - D("[ %s: cannot open bulk-out ep: errno=%d ]", USB_FFS_ADB_OUT, errno); + PLOG(ERROR) << "cannot open bulk-out endpoint " << USB_FFS_ADB_OUT; goto err; } h->bulk_in = adb_open(USB_FFS_ADB_IN, O_RDWR); if (h->bulk_in < 0) { - D("[ %s: cannot open bulk-in ep: errno=%d ]", USB_FFS_ADB_IN, errno); + PLOG(ERROR) << "cannot open bulk-in endpoint " << USB_FFS_ADB_IN; goto err; } @@ -356,12 +358,13 @@ static void usb_ffs_open_thread(void* x) { while (true) { if (init_functionfs(usb)) { + LOG(INFO) << "functionfs successfully initialized"; break; } std::this_thread::sleep_for(1s); } - D("[ usb_thread - registering device ]"); + LOG(INFO) << "registering usb transport"; register_usb_transport(usb, 0, 0, 1); } @@ -430,6 +433,8 @@ static void usb_ffs_kick(usb_handle* h) { } static void usb_ffs_close(usb_handle* h) { + LOG(INFO) << "closing functionfs transport"; + h->kicked = false; adb_close(h->bulk_out); adb_close(h->bulk_in); diff --git a/transport_usb.cpp b/transport_usb.cpp index 2f46920..7e8ae67 100644 --- a/transport_usb.cpp +++ b/transport_usb.cpp @@ -120,24 +120,24 @@ err_msg: static int remote_read(apacket *p, atransport *t) { if (usb_read(t->usb, &p->msg, sizeof(amessage))) { - D("remote usb: read terminated (message)"); + PLOG(ERROR) << "remote usb: read terminated (message)"; return -1; } if (!check_header(p, t)) { - D("remote usb: check_header failed"); + LOG(ERROR) << "remote usb: check_header failed"; return -1; } if (p->msg.data_length) { if (usb_read(t->usb, p->data, p->msg.data_length)) { - D("remote usb: terminated (data)"); + PLOG(ERROR) << "remote usb: terminated (data)"; return -1; } } if (!check_data(p)) { - D("remote usb: check_data failed"); + LOG(ERROR) << "remote usb: check_data failed"; return -1; } @@ -150,12 +150,12 @@ static int remote_write(apacket *p, atransport *t) unsigned size = p->msg.data_length; if (usb_write(t->usb, &p->msg, sizeof(amessage))) { - D("remote usb: 1 - write terminated"); + PLOG(ERROR) << "remote usb: 1 - write terminated"; return -1; } - if(p->msg.data_length == 0) return 0; + if (p->msg.data_length == 0) return 0; if (usb_write(t->usb, &p->data, size)) { - D("remote usb: 2 - write terminated"); + PLOG(ERROR) << "remote usb: 2 - write terminated"; return -1; } |