Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / modules / adb / 18f7a5c3ad9846a585e893518f15fa4dd19bc4c1
commit18f7a5c3ad9846a585e893518f15fa4dd19bc4c1[log] [tgz]
authorJosh Gao <jmgao@google.com>Fri Jan 11 14:42:08 2019 -0800
committerJosh Gao <jmgao@google.com>Thu Jan 31 23:36:41 2019 -0800
tree757322aa4775795e4ecce97367eaf3972fe73efe
parent06d4e749e56d45509c87e00e6ab2e2d8193bd4f5 [diff]
adb: don't close sockets before hitting EOF.

Reimplement commit de4b85ee780b4f4a0223b949b9a36d3ca1762635 using
fdevent. The previous attempt was reverted because we were blindly
continuing when revents & POLLIN == 0, which ignored POLLHUP/POLLERR,
leading to spinloops when the opposite end of the file descriptor was
shutdown when we had no data left to read.

This patch reimplements the functionality implemented by that commit
using fdevent, which gets us detection of spin loops for free.

Bug: http://b/74616284
Test: ./test_device.py
Change-Id: I1abd671fef4c29e99dad968aa66bb754ca382578
3 files changed
tree: 757322aa4775795e4ecce97367eaf3972fe73efe
  1. client/
  2. daemon/
  3. fastdeploy/
  4. sysdeps/
  5. .clang-format ⇨ ../.clang-format-4
  6. adb.bash
  7. adb.cpp
  8. adb.h
  9. adb_auth.h
  10. adb_integration_test_adb.xml
  11. adb_integration_test_device.xml
  12. adb_io.cpp
  13. adb_io.h
  14. adb_io_test.cpp
  15. adb_listeners.cpp
  16. adb_listeners.h
  17. adb_listeners_test.cpp
  18. adb_mdns.h
  19. adb_trace.cpp
  20. adb_trace.h
  21. adb_unique_fd.cpp
  22. adb_unique_fd.h
  23. adb_utils.cpp
  24. adb_utils.h
  25. adb_utils_test.cpp
  26. Android.bp
  27. benchmark_device.py
  28. bugreport_test.cpp
  29. fdevent.cpp
  30. fdevent.h
  31. fdevent_test.cpp
  32. fdevent_test.h
  33. file_sync_protocol.h
  34. MODULE_LICENSE_APACHE2
  35. NOTICE
  36. OVERVIEW.TXT
  37. OWNERS
  38. protocol.txt
  39. security_log_tags.h
  40. services.cpp
  41. services.h
  42. SERVICES.TXT
  43. shell_protocol.h
  44. shell_service_protocol.cpp
  45. shell_service_protocol_test.cpp
  46. socket.h
  47. socket_spec.cpp
  48. socket_spec.h
  49. socket_spec_test.cpp
  50. socket_test.cpp
  51. sockets.cpp
  52. sockets.dia
  53. SYNC.TXT
  54. sysdeps.h
  55. sysdeps_test.cpp
  56. sysdeps_unix.cpp
  57. sysdeps_win32.cpp
  58. sysdeps_win32_test.cpp
  59. test_adb.py
  60. test_device.py
  61. trace.sh
  62. transport.cpp
  63. transport.h
  64. transport_benchmark.cpp
  65. transport_fd.cpp
  66. transport_local.cpp
  67. transport_test.cpp
  68. transport_usb.cpp
  69. types.h
  70. types_test.cpp
  71. usb.h