ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: switch from system_clock to steady_clock." am: 278754aeac

Browse source 
am: f2dd09ff5b

Change-Id: I3bdae32bb3350e3b1137f43b32559e9a13331b40
This commit is contained in:
Josh Gao 2019-07-23 18:40:53 -07:00 • committed by android-build-merger
commit d2a00f50b2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/client/usb_linux.cpp
View file

@ -324,7 +324,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
h->urb_out_busy = true; h->urb_out_busy = true;
while (true) { while (true) {
auto now = std::chrono::system_clock::now(); auto now = std::chrono::steady_clock::now();
if (h->cv.wait_until(lock, now + 5s) == std::cv_status::timeout || h->dead) { if (h->cv.wait_until(lock, now + 5s) == std::cv_status::timeout || h->dead) {
// TODO: call USBDEVFS_DISCARDURB? // TODO: call USBDEVFS_DISCARDURB?
errno = ETIMEDOUT; errno = ETIMEDOUT;