commit 3761d0cb4b6112d88133863cd4bc31a1d0bc867c
author Maciej Żenczykowski <maze@google.com> Fri Apr 24 16:19:20 2020 +0000
committer Maciej Zenczykowski <maze@google.com> Fri Apr 24 17:15:07 2020 +0000
tree a5cc325b57ced748b0384d1178571a16fea33ca2
parent 8e14cbcaccea7650064d357704e3688d025a30a0

remove some unused variables

Fixes:
  device/generic/goldfish-opengl/android-emu/android/base/ring_buffer.c:
  426:23: warning: unused variable 'yield_backoff_us' [-Wunused-const-variable]
  427:23: warning: unused variable 'sleep_backoff_us' [-Wunused-const-variable]
  435:14: warning: unused variable 'start_us' [-Wunused-variable]
  436:14: warning: unused variable 'curr_wait_us' [-Wunused-variable]
  478:14: warning: unused variable 'step_shift' [-Wunused-variable]

which in turn makes ring_buffer_curr_us() an unused function and thus can be deleted.

Test: builds, and:
  git grep 'yield_backoff_us|sleep_backoff_us|start_us|curr_wait_us|step_shift'
  finds nothing
Bug: 153035880
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia45892ff8bcf215c87a531acc18b343ccb732ad5
Merged-In: Ia45892ff8bcf215c87a531acc18b343ccb732ad5

android-emu/android/base/ring_buffer.c

diff --git a/android-emu/android/base/ring_buffer.c b/android-emu/android/base/ring_buffer.c
index 1ad122e..527d2ea 100644
--- a/android-emu/android/base/ring_buffer.c
+++ b/android-emu/android/base/ring_buffer.c
@@ -415,26 +415,12 @@
 #endif
 }
 
-static uint64_t ring_buffer_curr_us() {
-    uint64_t res;
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    res = tv.tv_sec * 1000000ULL + tv.tv_usec;
-    return res;
-}
-
-static const uint32_t yield_backoff_us = 1000;
-static const uint32_t sleep_backoff_us = 2000;
-
 bool ring_buffer_wait_write(
     const struct ring_buffer* r,
     const struct ring_buffer_view* v,
     uint32_t bytes,
     uint64_t timeout_us) {
 
-    uint64_t start_us = ring_buffer_curr_us();
-    uint64_t curr_wait_us;
-
     bool can_write =
         v ? ring_buffer_view_can_write(r, v, bytes) :
             ring_buffer_can_write(r, bytes);
@@ -475,7 +461,6 @@
     struct ring_buffer_view* v,
     uint32_t bytes) {
 
-    uint32_t step_shift = 0;
     uint32_t available = v ? (v->size >> 1) : (RING_BUFFER_SIZE >> 1);
     uint32_t res = available < bytes ? available : bytes;