diff options
| author | Lingfeng Yang <lfy@google.com> | 2020-07-16 18:14:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 18:14:34 +0000 |
| commit | aab08a8828c4ea592983723fa3917fb489030a33 (patch) | |
| tree | f612579d1c3361ee7ffb02ea931d15f08762cf94 | |
| parent | 3b7183e5dc850ee848da69a799d9364098af06be (diff) | |
| parent | bc6b7b28e106b641a0113eaded9dae0385e42ee3 (diff) | |
| download | device_generic_goldfish-opengl-aab08a8828c4ea592983723fa3917fb489030a33.tar.gz device_generic_goldfish-opengl-aab08a8828c4ea592983723fa3917fb489030a33.tar.bz2 device_generic_goldfish-opengl-aab08a8828c4ea592983723fa3917fb489030a33.zip | |
Merge changes I55f26e97,Iec044d31 am: ec6b3a9781 am: bc6b7b28e1
Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/1363625
Change-Id: Ide29f86f33bf5457493cc2581ceac9d81f08d09c
| -rw-r--r-- | android-emu/android/base/ring_buffer.c | 23 | ||||
| -rw-r--r-- | android-emu/android/base/ring_buffer.h | 6 |
2 files changed, 8 insertions, 21 deletions
diff --git a/android-emu/android/base/ring_buffer.c b/android-emu/android/base/ring_buffer.c index 527d2ea8..fb6845f2 100644 --- a/android-emu/android/base/ring_buffer.c +++ b/android-emu/android/base/ring_buffer.c @@ -407,19 +407,10 @@ long ring_buffer_view_read( void ring_buffer_yield() { } -static void ring_buffer_sleep() { -#ifdef _WIN32 - Sleep(2); -#else - usleep(2000); -#endif -} - bool ring_buffer_wait_write( const struct ring_buffer* r, const struct ring_buffer_view* v, - uint32_t bytes, - uint64_t timeout_us) { + uint32_t bytes) { bool can_write = v ? ring_buffer_view_can_write(r, v, bytes) : @@ -438,8 +429,7 @@ bool ring_buffer_wait_write( bool ring_buffer_wait_read( const struct ring_buffer* r, const struct ring_buffer_view* v, - uint32_t bytes, - uint64_t timeout_us) { + uint32_t bytes) { bool can_read = v ? ring_buffer_view_can_read(r, v, bytes) : @@ -457,7 +447,6 @@ bool ring_buffer_wait_read( } static uint32_t get_step_size( - struct ring_buffer* r, struct ring_buffer_view* v, uint32_t bytes) { @@ -491,7 +480,7 @@ uint32_t ring_buffer_write_fully_with_abort( uint32_t abort_value, const volatile uint32_t* abort_ptr) { - uint32_t candidate_step = get_step_size(r, v, bytes); + uint32_t candidate_step = get_step_size(v, bytes); uint32_t processed = 0; uint8_t* dst = (uint8_t*)data; @@ -502,7 +491,7 @@ uint32_t ring_buffer_write_fully_with_abort( } long processed_here = 0; - ring_buffer_wait_write(r, v, candidate_step, (uint64_t)(-1)); + ring_buffer_wait_write(r, v, candidate_step); if (v) { processed_here = ring_buffer_view_write(r, v, dst + processed, candidate_step, 1); @@ -528,7 +517,7 @@ uint32_t ring_buffer_read_fully_with_abort( uint32_t abort_value, const volatile uint32_t* abort_ptr) { - uint32_t candidate_step = get_step_size(r, v, bytes); + uint32_t candidate_step = get_step_size(v, bytes); uint32_t processed = 0; uint8_t* dst = (uint8_t*)data; @@ -540,7 +529,7 @@ uint32_t ring_buffer_read_fully_with_abort( } long processed_here = 0; - ring_buffer_wait_read(r, v, candidate_step, (uint64_t)(-1)); + ring_buffer_wait_read(r, v, candidate_step); if (v) { processed_here = ring_buffer_view_read(r, v, dst + processed, candidate_step, 1); diff --git a/android-emu/android/base/ring_buffer.h b/android-emu/android/base/ring_buffer.h index 390a7586..7007a870 100644 --- a/android-emu/android/base/ring_buffer.h +++ b/android-emu/android/base/ring_buffer.h @@ -116,13 +116,11 @@ long ring_buffer_view_read( bool ring_buffer_wait_write( const struct ring_buffer* r, const struct ring_buffer_view* v, - uint32_t bytes, - uint64_t timeout_us); + uint32_t bytes); bool ring_buffer_wait_read( const struct ring_buffer* r, const struct ring_buffer_view* v, - uint32_t bytes, - uint64_t timeout_us); + uint32_t bytes); // read/write fully, blocking if there is nothing to read/write. void ring_buffer_write_fully( |