Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / modules / adb / 3af421c6bd91a2f67fd9f9b5f90f7b9fb0870d8a
commit3af421c6bd91a2f67fd9f9b5f90f7b9fb0870d8a[log] [tgz]
authorElliott Hughes <enh@google.com>Thu Jul 23 15:20:09 2015 -0700
committerElliott Hughes <enh@google.com>Fri Jul 24 12:35:50 2015 -0700
treee195b89eb0c13b621e6116ca4e25a90d75f02d6f
parent6cde25edd8c2ef313aebe5852496baa5218ee48a [diff]
Clean up the locking in usb_linux.cpp.

tsan complained that usb_bulk_write accesses usb_handle members outside
a lock. Fix that, but by moving everything over to C++11 locking.

Note that the old code was checking whether pthread_cond_timedwait returned
a negative value, which it will never do --- it will signal timeout (or
any other error) by returning a positive errno value. The rewrite does
what they appeared to intend to do (break out on timeout), rather than
what they actually did (keep trying forever).

Bug: http://b/22598587
Change-Id: Iab6869ffed4874143a7da97193d6b09e34cf2933
2 files changed
tree: e195b89eb0c13b621e6116ca4e25a90d75f02d6f
  1. client/
  2. daemon/
  3. tests/
  4. .clang-format
  5. adb.cpp
  6. adb.h
  7. adb_auth.cpp
  8. adb_auth.h
  9. adb_auth_client.cpp
  10. adb_auth_host.cpp
  11. adb_client.cpp
  12. adb_client.h
  13. adb_io.cpp
  14. adb_io.h
  15. adb_io_test.cpp
  16. adb_listeners.cpp
  17. adb_listeners.h
  18. adb_trace.h
  19. adb_utils.cpp
  20. adb_utils.h
  21. adb_utils_test.cpp
  22. Android.mk
  23. commandline.cpp
  24. console.cpp
  25. CPPLINT.cfg
  26. fdevent.cpp
  27. fdevent.h
  28. file_sync_client.cpp
  29. file_sync_service.cpp
  30. file_sync_service.h
  31. framebuffer_service.cpp
  32. get_my_path_darwin.cpp
  33. get_my_path_linux.cpp
  34. get_my_path_windows.cpp
  35. jdwp_service.cpp
  36. MODULE_LICENSE_APACHE2
  37. mutex_list.h
  38. NOTICE
  39. OVERVIEW.TXT
  40. protocol.txt
  41. qemu_tracing.cpp
  42. qemu_tracing.h
  43. remount_service.cpp
  44. remount_service.h
  45. services.cpp
  46. SERVICES.TXT
  47. set_verity_enable_state_service.cpp
  48. sockets.cpp
  49. sockets.dia
  50. SYNC.TXT
  51. sysdeps.h
  52. sysdeps_win32.cpp
  53. test_track_devices.cpp
  54. transport.cpp
  55. transport.h
  56. transport_local.cpp
  57. transport_test.cpp
  58. transport_usb.cpp
  59. usb_linux.cpp
  60. usb_linux_client.cpp
  61. usb_osx.cpp
  62. usb_windows.cpp