commit 4f7a710c16dababb6b3b2e80ca489a4354704f1e
author Gousemoodhin Nadaf <gnadaf@codeaurora.org> Tue Feb 13 19:27:45 2018 +0530
committer Gousemoodhin Nadaf <gnadaf@codeaurora.org> Wed Feb 21 14:05:45 2018 +0530
tree a94c94037e5d83d5322b8fb489edeb906f4eba22
parent aa547488a20613e828f7b251f2b32eab4f8d4ed9

sdm: Use monotonic clock in HAL

gettimeofday() function returns wall clock time which can change if the
time is updated using NTP etc. Use clock_gettime() function to get
monotonic clock time to safely and reliably measure elapsed time in
a program.

CRs-Fixed: 2190449
Change-Id: Icc7e470b6427db58837473039d0537748de5b2aa

sdm/include/utils/locker.h

diff --git a/sdm/include/utils/locker.h b/sdm/include/utils/locker.h
old mode 100644
new mode 100755
index 0096098..dabeb11
--- a/sdm/include/utils/locker.h
+++ b/sdm/include/utils/locker.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2014 - 2016, The Linux Foundation. All rights reserved.
+* Copyright (c) 2014 - 2016, 2018 The Linux Foundation. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification, are permitted
 * provided that the following conditions are met:
@@ -26,6 +26,7 @@
 #define __LOCKER_H__
 
 #include <stdint.h>
+#include <errno.h>
 #include <pthread.h>
 #include <sys/time.h>
 
@@ -126,12 +127,15 @@
 
   Locker() : sequence_wait_(0) {
     pthread_mutex_init(&mutex_, 0);
-    pthread_cond_init(&condition_, 0);
+    pthread_condattr_init(&cond_attr);
+    pthread_condattr_setclock(&cond_attr, CLOCK_MONOTONIC);
+    pthread_cond_init(&condition_, &cond_attr);
   }
 
   ~Locker() {
     pthread_mutex_destroy(&mutex_);
     pthread_cond_destroy(&condition_);
+    pthread_condattr_destroy(&cond_attr);
   }
 
   void Lock() { pthread_mutex_lock(&mutex_); }
@@ -139,20 +143,21 @@
   void Signal() { pthread_cond_signal(&condition_); }
   void Broadcast() { pthread_cond_broadcast(&condition_); }
   void Wait() { pthread_cond_wait(&condition_, &mutex_); }
-  int WaitFinite(int ms) {
+  int WaitFinite(uint32_t ms) {
     struct timespec ts;
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    ts.tv_sec = tv.tv_sec + ms/1000;
-    ts.tv_nsec = tv.tv_usec*1000 + (ms%1000)*1000000;
-    ts.tv_sec += ts.tv_nsec/1000000000L;
-    ts.tv_nsec %= 1000000000L;
+    if (clock_gettime(CLOCK_MONOTONIC, &ts)) {
+       return EINVAL;
+    }
+    uint64_t ns = (uint64_t)ts.tv_nsec + (ms * 1000000L);
+    ts.tv_sec   = ts.tv_sec + (time_t)(ns / 1000000000L);
+    ts.tv_nsec  = ns % 1000000000L;
     return pthread_cond_timedwait(&condition_, &mutex_, &ts);
   }
 
  private:
   pthread_mutex_t mutex_;
   pthread_cond_t condition_;
+  pthread_condattr_t cond_attr;
   int sequence_wait_;   // This flag is set to 1 on sequence entry, 0 on exit, and -1 on cancel.
                         // Some routines will wait for sequence of function calls to finish
                         // so that capturing a transitionary snapshot of context is prevented.