Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_packages_modules_adb / 332823c2477ea4869be9862493492d92a5955061
commit332823c2477ea4869be9862493492d92a5955061[log] [tgz]
authorJosh Gao <jmgao@google.com>Tue May 19 20:41:36 2020 -0700
committerJosh Gao <jmgao@google.com>Tue May 19 20:54:40 2020 -0700
tree11121c85de6b9f889760fe883212bdfe72dd40d2
parent6f490bed62b78881cbc491089c97932ba849633f [diff]
adb: fix flakiness in PTY shell protocol.

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
1 file changed
tree: 11121c85de6b9f889760fe883212bdfe72dd40d2
  1. apex/
  2. client/
  3. coverage/
  4. crypto/
  5. daemon/
  6. fastdeploy/
  7. fdevent/
  8. libs/
  9. pairing_auth/
  10. pairing_connection/
  11. proto/
  12. sysdeps/
  13. tls/
  14. tools/
  15. .clang-format ⇨ ../.clang-format-4
  16. adb.bash
  17. adb.cpp
  18. adb.h
  19. adb_auth.h
  20. adb_integration_test_adb.xml
  21. adb_integration_test_device.xml
  22. adb_io.cpp
  23. adb_io.h
  24. adb_io_test.cpp
  25. adb_listeners.cpp
  26. adb_listeners.h
  27. adb_listeners_test.cpp
  28. adb_mdns.h
  29. adb_trace.cpp
  30. adb_trace.h
  31. adb_unique_fd.cpp
  32. adb_unique_fd.h
  33. adb_utils.cpp
  34. adb_utils.h
  35. adb_utils_test.cpp
  36. adb_wifi.h
  37. Android.bp
  38. benchmark_device.py
  39. bugreport_test.cpp
  40. compression_utils.h
  41. file_sync_protocol.h
  42. mdns_test.cpp
  43. MODULE_LICENSE_APACHE2
  44. NOTICE
  45. OVERVIEW.TXT
  46. OWNERS
  47. protocol.txt
  48. security_log_tags.h
  49. services.cpp
  50. services.h
  51. SERVICES.TXT
  52. shell_protocol.h
  53. shell_service_protocol.cpp
  54. shell_service_protocol_test.cpp
  55. SOCKET-ACTIVATION.txt
  56. socket.h
  57. socket_spec.cpp
  58. socket_spec.h
  59. socket_spec_test.cpp
  60. socket_test.cpp
  61. sockets.cpp
  62. sockets.dia
  63. SYNC.TXT
  64. sysdeps.h
  65. sysdeps_test.cpp
  66. sysdeps_unix.cpp
  67. sysdeps_win32.cpp
  68. sysdeps_win32_test.cpp
  69. test_adb.py
  70. test_device.py
  71. trace.sh
  72. transport.cpp
  73. transport.h
  74. transport_benchmark.cpp
  75. transport_fd.cpp
  76. transport_test.cpp
  77. types.cpp
  78. types.h
  79. types_test.cpp