openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

adb: add tracing to transport.cpp. 

Bug: http://b/31289465
Test: systrace
Change-Id: I41968f447b61ef1eea2b933a5fd8623605c4dea6
This commit is contained in:
Josh Gao 2016-11-29 09:40:29 -08:00
parent 1290fbf5eb
commit cfe72e290b
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
adb/transport.cpp
View File

@ -37,6 +37,7 @@
#include "adb.h"
#include "adb_auth.h"
#include "adb_trace.h"
#include "adb_utils.h"
#include "diagnose_usb.h"
@ -88,6 +89,7 @@ static std::string dump_packet(const char* name, const char* func, apacket* p) {
}
static int read_packet(int fd, const char* name, apacket** ppacket) {
ATRACE_NAME("read_packet");
char buff[8];
if (!name) {
snprintf(buff, sizeof buff, "fd=%d", fd);
@ -111,6 +113,7 @@ static int read_packet(int fd, const char* name, apacket** ppacket) {
}
static int write_packet(int fd, const char* name, apacket** ppacket) {
ATRACE_NAME("write_packet");
char buff[8];
if (!name) {
snprintf(buff, sizeof buff, "fd=%d", fd);
@ -194,19 +197,23 @@ static void read_transport_thread(void* _t) {
D("%s: data pump started", t->serial);
for (;;) {
ATRACE_NAME("read_transport loop");
p = get_apacket();
if (t->read_from_remote(p, t) == 0) {
D("%s: received remote packet, sending to transport", t->serial);
if (write_packet(t->fd, t->serial, &p)) {
{
ATRACE_NAME("read_transport read_remote");
if (t->read_from_remote(p, t) != 0) {
D("%s: remote read failed for transport", t->serial);
put_apacket(p);
D("%s: failed to write apacket to transport", t->serial);
goto oops;
break;
}
} else {
D("%s: remote read failed for transport", t->serial);
}
D("%s: received remote packet, sending to transport", t->serial);
if (write_packet(t->fd, t->serial, &p)) {
put_apacket(p);
break;
D("%s: failed to write apacket to transport", t->serial);
goto oops;
}
}
@ -239,10 +246,12 @@ static void write_transport_thread(void* _t) {
D("%s: starting write_transport thread, reading from fd %d", t->serial, t->fd);
for (;;) {
ATRACE_NAME("write_transport loop");
if (read_packet(t->fd, t->serial, &p)) {
D("%s: failed to read apacket from transport on fd %d", t->serial, t->fd);
break;
}
if (p->msg.command == A_SYNC) {
if (p->msg.arg0 == 0) {
D("%s: transport SYNC offline", t->serial);
@ -259,6 +268,7 @@ static void write_transport_thread(void* _t) {
} else {
if (active) {
D("%s: transport got packet, sending to remote", t->serial);
ATRACE_NAME("write_transport write_remote");
t->write_to_remote(p, t);
} else {
D("%s: transport ignoring packet while offline", t->serial);