b5e11415d9
When device goes offline, user usually has to manually replug the usb device. This patch tries to solve two offline situations, all because when adb on host is killed, the adbd on device is not notified. 1. When adb server is killed while pushing a large file to device, the device is still reading the unfinished large message. So the device thinks of the CNXN message as part of the previous unfinished message, so it doesn't reply and the device is in offline state. The solution is to add a write_msg_lock in atransport struct. And it kicks the transport only after sending a whole message. By kicking all transports before exit, we ensure that we don't write part of a message to any device. So next time we start adb server, the device should be waiting for a new message. 2. When adb server is killed while pulling a large file from device, the device is still trying to send the unfinished large message. So adb on host usually reads data with EOVERFLOW error. This is because adb on host is reading less than one packet sent from device. The solution is to use buffered read on host. The max packet size of bulk transactions in USB 3.0 is 1024 bytes. By preparing an at least 1024 bytes buffer when reading, EOVERFLOW no longer occurs. And teach adb host to ignore wrong messages. To be safe, this patch doesn't change any logic on device. Bug: http://b/32952319 Test: run python -m unittest -q test_device.DeviceOfflineTest Test: on linux/mac/windows with bullhead, ryu. Change-Id: Ib149d30028a62a6f03857b8a95ab5a1d6e9b9c4e
68 lines
1.8 KiB
C
68 lines
1.8 KiB
C
/*
|
|
* Copyright (C) 2014 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef __ADB_TRACE_H
|
|
#define __ADB_TRACE_H
|
|
|
|
#include <android-base/logging.h>
|
|
#include <android-base/stringprintf.h>
|
|
|
|
/* IMPORTANT: if you change the following list, don't
|
|
* forget to update the corresponding 'tags' table in
|
|
* the adb_trace_init() function implemented in adb_trace.cpp.
|
|
*/
|
|
enum AdbTrace {
|
|
ADB = 0, /* 0x001 */
|
|
SOCKETS,
|
|
PACKETS,
|
|
TRANSPORT,
|
|
RWX, /* 0x010 */
|
|
USB,
|
|
SYNC,
|
|
SYSDEPS,
|
|
JDWP, /* 0x100 */
|
|
SERVICES,
|
|
AUTH,
|
|
FDEVENT,
|
|
SHELL
|
|
};
|
|
|
|
#define VLOG_IS_ON(TAG) \
|
|
((adb_trace_mask & (1 << (TAG))) != 0)
|
|
|
|
#define VLOG(TAG) \
|
|
if (LIKELY(!VLOG_IS_ON(TAG))) \
|
|
; \
|
|
else \
|
|
LOG(INFO)
|
|
|
|
// You must define TRACE_TAG before using this macro.
|
|
#define D(...) \
|
|
VLOG(TRACE_TAG) << android::base::StringPrintf(__VA_ARGS__)
|
|
|
|
|
|
extern int adb_trace_mask;
|
|
void adb_trace_init(char**);
|
|
void adb_trace_enable(AdbTrace trace_tag);
|
|
|
|
// Include <atomic> before stdatomic.h (introduced in cutils/trace.h) to avoid compile error.
|
|
#include <atomic>
|
|
|
|
#define ATRACE_TAG ATRACE_TAG_ADB
|
|
#include <cutils/trace.h>
|
|
#include <utils/Trace.h>
|
|
|
|
#endif /* __ADB_TRACE_H */
|