commit a7647a1d33e41d35b1af2469c5f06f387c4b2bf4
author Mark Salyzyn <salyzyn@google.com> Tue Sep 08 08:32:01 2015 -0700
committer Rom Lemarchand <romlem@google.com> Mon Nov 16 08:53:04 2015 -0800
tree 65f88cb7433cbeb51ca8a2ee6a854cf4a023871d
parent 191abf535d092d2dfcbeac636e3c6e33c0e6f8d1

liblog: add android_log_timestamp() private function

(cherry pick from commit 500afc75325823c03dbdf6b2d56fd86e29f120f4)

Change-Id: Iefbea3b1be2f97cfdeb35e5330e5495e0337215b

include/log/logger.h

diff --git a/include/log/logger.h b/include/log/logger.h
index f030dab..c795253 100644
--- a/include/log/logger.h
+++ b/include/log/logger.h
@@ -183,6 +183,8 @@
                                              pid_t pid);
 #define android_logger_list_close android_logger_list_free
 
+char android_log_timestamp();
+
 /*
  * log_id_t helpers
  */

liblog/log_is_loggable.c

diff --git a/liblog/log_is_loggable.c b/liblog/log_is_loggable.c
index 7a8e33f..38b2bb6 100644
--- a/liblog/log_is_loggable.c
+++ b/liblog/log_is_loggable.c
@@ -176,3 +176,28 @@
     int logLevel = __android_log_level(tag, def);
     return logLevel >= 0 && prio >= logLevel;
 }
+
+char android_log_timestamp()
+{
+    static struct cache r_time_cache = { NULL, -1, 0 };
+    static struct cache p_time_cache = { NULL, -1, 0 };
+    static uint32_t serial;
+    uint32_t current_serial;
+    char retval;
+
+    pthread_mutex_lock(&lock);
+
+    current_serial = __system_property_area_serial();
+    if (current_serial != serial) {
+        refresh_cache(&r_time_cache, "ro.logd.timestamp");
+        refresh_cache(&p_time_cache, "persist.logd.timestamp");
+        serial = current_serial;
+    }
+    if (!(retval = p_time_cache.c)) {
+        retval = r_time_cache.c;
+    }
+
+    pthread_mutex_unlock(&lock);
+
+    return tolower(retval ?: 'r');
+}