tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "adb: turn CHECKs into an error + transport restart."

Browse source 
am: ad0f27fe72

Change-Id: I4d7c3fdd614592bcd52ca181b02414827b227967
This commit is contained in:
Josh Gao 2019-06-18 20:28:18 -07:00 committed by android-build-merger
commit 7373282999
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
adb/daemon/usb.cpp
View file

@ -509,14 +509,16 @@ struct UsbFfsConnection : public Connection {
}
if (id.direction == TransferDirection::READ) {
HandleRead(id, event.res);
if (!HandleRead(id, event.res)) {
return;
}
} else {
HandleWrite(id);
}
}
}
void HandleRead(TransferId id, int64_t size) {
bool HandleRead(TransferId id, int64_t size) {
uint64_t read_idx = id.id % kUsbReadQueueDepth;
IoBlock* block = &read_requests_[read_idx];
block->pending = false;
@ -526,7 +528,7 @@ struct UsbFfsConnection : public Connection {
if (block->id().id != needed_read_id_) {
LOG(VERBOSE) << "read " << block->id().id << " completed while waiting for "
<< needed_read_id_;
return;
return true;
}
for (uint64_t id = needed_read_id_;; ++id) {
@ -535,15 +537,22 @@ struct UsbFfsConnection : public Connection {
if (current_block->pending) {
break;
}
ProcessRead(current_block);
if (!ProcessRead(current_block)) {
return false;
}
++needed_read_id_;
}
return true;
}
void ProcessRead(IoBlock* block) {
bool ProcessRead(IoBlock* block) {
if (!block->payload->empty()) {
if (!incoming_header_.has_value()) {
CHECK_EQ(sizeof(amessage), block->payload->size());
if (block->payload->size() != sizeof(amessage)) {
HandleError("received packet of unexpected length while reading header");
return false;
}
amessage msg;
memcpy(&msg, block->payload->data(), sizeof(amessage));
LOG(DEBUG) << "USB read:" << dump_header(&msg);
@ -551,7 +560,10 @@ struct UsbFfsConnection : public Connection {
} else {
size_t bytes_left = incoming_header_->data_length - incoming_payload_.size();
Block payload = std::move(*block->payload);
CHECK_LE(payload.size(), bytes_left);
if (block->payload->size() > bytes_left) {
HandleError("received too many bytes while waiting for payload");
return false;
}
incoming_payload_.append(std::make_unique<Block>(std::move(payload)));
}
@ -570,6 +582,7 @@ struct UsbFfsConnection : public Connection {
PrepareReadBlock(block, block->id().id + kUsbReadQueueDepth);
SubmitRead(block);
return true;
}
bool SubmitRead(IoBlock* block) {