From b31f9ce6d150a264f584d9b38a54da0723fc249c Mon Sep 17 00:00:00 2001
From: Jerry Zhang <zhangjerry@google.com>
Date: Mon, 21 May 2018 16:04:57 -0700
Subject: recovery: c++ify pthread use in UI

Change pthread usage to std::mutex,
lock_guard, unique_lock, thread, or
condition_variable as appropriate.

Test: Recovery works, recovery_component_test pass
Bug: 78793464
Change-Id: Ibf0b1bbedcf0b6e32fc4ee6aaadd17f21b4d7077
---
 ui.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'ui.h')

diff --git a/ui.h b/ui.h
index 75390d83c..32e28099e 100644
--- a/ui.h
+++ b/ui.h
@@ -18,10 +18,11 @@
 #define RECOVERY_UI_H
 
 #include <linux/input.h>  // KEY_MAX
-#include <pthread.h>
 
 #include <atomic>
+#include <condition_variable>
 #include <functional>
+#include <mutex>
 #include <string>
 #include <thread>
 #include <vector>
@@ -188,8 +189,8 @@ class RecoveryUI {
   bool InitScreensaver();
 
   // Key event input queue
-  pthread_mutex_t key_queue_mutex;
-  pthread_cond_t key_queue_cond;
+  std::mutex key_queue_mutex;
+  std::condition_variable key_queue_cond;
   int key_queue[256], key_queue_len;
   char key_pressed[KEY_MAX + 1];  // under key_queue_mutex
   int key_last_down;              // under key_queue_mutex
-- 
cgit v1.2.3