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

adb: fix flakiness in PTY shell protocol.

Browse source 
When a subprocess closes its PTY slave, the master fd will report
POLLHUP when polled. This leads to us prematurely tearing everything
down, without reading out output that's been written to the PTY.

Resolve this by waiting until the fd no longer reports POLLIN.

Bug: http://b/156551485
Bug: http://b/156552734
Test: `adb shell 'X=0; while /data/nativetest64/adbd_test/adbd_test --gtest_filter="ShellServiceTest.*Pty*" >/dev/null 2>&1; do X=$((X+1)); echo $X; done'` for 1000 iterations (failed within 20, previously)
Test: test_device.py
Change-Id: Ie591e0cafb532cd6cebdf6f356dc967565b5a2d9
This commit is contained in:
Josh Gao 2020-05-19 20:41:36 -07:00
parent 1fbb1b8718
commit be41ae5666
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adb/daemon/shell_service.cpp
View file

@ -646,15 +646,21 @@ unique_fd* Subprocess::PollLoop(SubprocessPollfds* pfds) {
}
// After handling all of the events we've received, check to see if any fds have died.
if (stdinout_pfd.revents & (POLLHUP | POLLRDHUP | POLLERR | POLLNVAL)) {
auto poll_finished = [](int events) {
// Don't return failure until we've read out all of the fd's incoming data.
return (events & POLLIN) == 0 &&
(events & (POLLHUP | POLLRDHUP | POLLERR | POLLNVAL)) != 0;
};
if (poll_finished(stdinout_pfd.revents)) {
return &stdinout_sfd_;
}
if (stderr_pfd.revents & (POLLHUP | POLLRDHUP | POLLERR | POLLNVAL)) {
if (poll_finished(stderr_pfd.revents)) {
return &stderr_sfd_;
}
if (protocol_pfd.revents & (POLLHUP | POLLRDHUP | POLLERR | POLLNVAL)) {
if (poll_finished(protocol_pfd.revents)) {
return &protocol_sfd_;
}
} // while (!dead_sfd)