commit fb961e506628f484ce2bde53c919d05941dec6f2
author Shuzhen Wang <shuzhenwang@google.com> Mon Nov 28 11:48:02 2016 -0800
committer Zhijun He <zhijunhe@google.com> Tue Jan 10 19:50:54 2017 -0800
tree 756106b31f5080c959665545b63115fe635cd75b
parent a5da1026bc86bb3365d886024cf0c2589c08196a

QCamera2: HAL3: Use monotonic timestamp for pthread_cond_timedwait

Wall time may jump forward/backward. Especially when it jumps forward,
pthread_cond_timedwait may return early with TIMEOUT.

Switch to MONOTONIC time base instead.

Bug: 33110475
Change-Id: I63efbe24c49c3f539530d6461e89fbfe62a24920

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 175726d..33c8859 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -60,6 +60,7 @@
 extern "C" {
 #include "mm_camera_dbg.h"
 }
+#include "cam_cond.h"
 
 using namespace android;
 
@@ -437,9 +438,9 @@
     //TBD - To see if this hardcoding is needed. Check by printing if this is filled by mctl to 3
     gCamCapability[cameraId]->min_num_pp_bufs = 3;
 
-    pthread_cond_init(&mBuffersCond, NULL);
+    PTHREAD_COND_INIT(&mBuffersCond);
 
-    pthread_cond_init(&mRequestCond, NULL);
+    PTHREAD_COND_INIT(&mRequestCond);
     mPendingLiveRequest = 0;
     mCurrentRequestId = -1;
     pthread_mutex_init(&mMutex, NULL);
@@ -5023,7 +5024,7 @@
     // Added a timed condition wait
     struct timespec ts;
     uint8_t isValidTimeout = 1;
-    rc = clock_gettime(CLOCK_REALTIME, &ts);
+    rc = clock_gettime(CLOCK_MONOTONIC, &ts);
     if (rc < 0) {
       isValidTimeout = 0;
       LOGE("Error reading the real time clock!!");
@@ -5275,7 +5276,7 @@
     }
 
     /* wait on a signal that buffers were received */
-    rc = clock_gettime(CLOCK_REALTIME, &timeout);
+    rc = clock_gettime(CLOCK_MONOTONIC, &timeout);
     if (rc < 0) {
         LOGE("Error reading the real time clock, cannot use timed wait");
     } else {