Merge ~chihchun/libhybris/+git/libhybris-ubuntu:missing-hooks into ~morphis/libhybris/+git/libhybris-ubuntu:missing-hooks

[Rex Tsai]

hybris: common: hook pthread_mutex_timedlock function.

./vendor/mediatek/proprietary/platform/common/hardware/audio/include/AudioLock.h uses pthread_mutex_timedlock()

Unmerged commits

aa1f896... by Rex Tsai on 2016-01-06

hybris: common: hook pthread_mutex_timedlock function.

./vendor/mediatek/proprietary/platform/common/hardware/audio/include/AudioLock.h uses pthread_mutex_timedlock()

diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c
index 8bc510c..4be32bc 100644
--- a/hybris/common/hooks.c
+++ b/hybris/common/hooks.c
@@ -948,6 +948,29 @@ static int my_pthread_rwlockattr_destroy(pthread_rwlockattr_t *__attr)
     return ret;
 }
 
+static int my_pthread_mutex_timedlock(pthread_mutex_t *__mutex,
+                                      const struct timespec *__abs_timeout)
+{
+    if (!__mutex) {
+        LOGD("Null mutex lock, not unlocking.");
+        return 0;
+    }
+
+    unsigned int value = (*(unsigned int *) __mutex);
+    if (hybris_check_android_shared_mutex(value)) {
+        LOGD("Shared mutex with Android, not lock timeout np.");
+        return 0;
+    }
+
+    pthread_mutex_t *realmutex = (pthread_mutex_t *) value;
+    if (value <= ANDROID_TOP_ADDR_VALUE_MUTEX) {
+        realmutex = hybris_alloc_init_mutex(value);
+        *((int *)__mutex) = (int) realmutex;
+    }
+
+    return pthread_mutex_timedlock(realmutex, __abs_timeout);
+}
+
 static int my_pthread_rwlockattr_setpshared(pthread_rwlockattr_t *__attr,
                                             int pshared)
 {
@@ -1835,6 +1858,7 @@ static struct _hook hooks[] = {
     {"pthread_mutex_unlock", my_pthread_mutex_unlock},
     {"pthread_mutex_trylock", my_pthread_mutex_trylock},
     {"pthread_mutex_lock_timeout_np", my_pthread_mutex_lock_timeout_np},
+    {"pthread_mutex_timedlock", my_pthread_mutex_timedlock},
     {"pthread_mutexattr_init", pthread_mutexattr_init},
     {"pthread_mutexattr_destroy", pthread_mutexattr_destroy},
     {"pthread_mutexattr_gettype", pthread_mutexattr_gettype},