Merge "Revert "logd: liblog: logcat: switch to android_log_clockid()""

am: b566435b02

* commit 'b566435b02d90663b5a26ba795bfb2f0102e8833':
  Revert "logd: liblog: logcat: switch to android_log_clockid()"

include/log/logger.h

@@ -11,8 +11,6 @@
 #define _LIBS_LOG_LOGGER_H
 
 #include <stdint.h>
-#include <time.h>
-
 #include <log/log.h>
 #include <log/log_read.h>
 
@@ -185,7 +183,7 @@ struct logger_list *android_logger_list_open(log_id_t id,
                                              pid_t pid);
 #define android_logger_list_close android_logger_list_free
 
-clockid_t android_log_clockid();
+char android_log_timestamp();
 
 /*
  * log_id_t helpers

liblog/log_is_loggable.c

@@ -196,18 +196,18 @@ int __android_log_is_loggable(int prio, const char *tag, int default_prio)
  * rare, we can accept a trylock failure gracefully. Use a separate
  * lock from is_loggable to keep contention down b/25563384.
  */
-static pthread_mutex_t lock_clockid = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t lock_timestamp = PTHREAD_MUTEX_INITIALIZER;
 
-clockid_t android_log_clockid()
+char android_log_timestamp()
 {
     static struct cache r_time_cache = { NULL, -1, 0 };
     static struct cache p_time_cache = { NULL, -1, 0 };
-    char c;
+    char retval;
 
-    if (pthread_mutex_trylock(&lock_clockid)) {
+    if (pthread_mutex_trylock(&lock_timestamp)) {
         /* We are willing to accept some race in this context */
-        if (!(c = p_time_cache.c)) {
-            c = r_time_cache.c;
+        if (!(retval = p_time_cache.c)) {
+            retval = r_time_cache.c;
         }
     } else {
         static uint32_t serial;
@@ -217,12 +217,12 @@ clockid_t android_log_clockid()
             refresh_cache(&p_time_cache, "persist.logd.timestamp");
             serial = current_serial;
         }
-        if (!(c = p_time_cache.c)) {
-            c = r_time_cache.c;
+        if (!(retval = p_time_cache.c)) {
+            retval = r_time_cache.c;
         }
 
-        pthread_mutex_unlock(&lock_clockid);
+        pthread_mutex_unlock(&lock_timestamp);
     }
 
-    return (tolower(c) == 'm') ? CLOCK_MONOTONIC : CLOCK_REALTIME;
+    return tolower(retval ?: 'r');
 }

liblog/logd_write.c

@@ -212,7 +212,11 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec *vec, size_t nr)
      *  };
      */
 
-    clock_gettime(android_log_clockid(), &ts);
+    if (android_log_timestamp() == 'm') {
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+    } else {
+        clock_gettime(CLOCK_REALTIME, &ts);
+    }
 
     pmsg_header.magic = LOGGER_MAGIC;
     pmsg_header.len = sizeof(pmsg_header) + sizeof(header);

liblog/logprint.c

@@ -203,7 +203,7 @@ AndroidLogFormat *android_log_format_new()
     p_ret->year_output = false;
     p_ret->zone_output = false;
     p_ret->epoch_output = false;
-    p_ret->monotonic_output = android_log_clockid() == CLOCK_MONOTONIC;
+    p_ret->monotonic_output = android_log_timestamp() == 'm';
 
     return p_ret;
 }
@@ -1262,7 +1262,7 @@ char *android_log_formatLogLine (
     nsec = entry->tv_nsec;
     if (p_format->monotonic_output) {
         // prevent convertMonotonic from being called if logd is monotonic
-        if (android_log_clockid() != CLOCK_MONOTONIC) {
+        if (android_log_timestamp() != 'm') {
             struct timespec time;
             convertMonotonic(&time, entry);
             now = time.tv_sec;

logcat/logcat.cpp

@@ -398,9 +398,11 @@ static log_time lastLogTime(char *outputFileName) {
         return retval;
     }
 
-    clockid_t clock_type = android_log_clockid();
-    log_time now(clock_type);
-    bool monotonic = clock_type == CLOCK_MONOTONIC;
+    log_time now(CLOCK_REALTIME);
+    bool monotonic = android_log_timestamp() == 'm';
+    if (monotonic) {
+        now = log_time(CLOCK_MONOTONIC);
+    }
 
     std::string directory;
     char *file = strrchr(outputFileName, '/');

logcat/tests/logcat_test.cpp

@@ -76,7 +76,7 @@ TEST(logcat, buckets) {
 
 TEST(logcat, year) {
 
-    if (android_log_clockid() == CLOCK_MONOTONIC) {
+    if (android_log_timestamp() == 'm') {
         fprintf(stderr, "Skipping test, logd is monotonic time\n");
         return;
     }
@@ -147,7 +147,7 @@ char *fgetLongTime(char *buffer, size_t buflen, FILE *fp) {
 
 TEST(logcat, tz) {
 
-    if (android_log_clockid() == CLOCK_MONOTONIC) {
+    if (android_log_timestamp() == 'm') {
         fprintf(stderr, "Skipping test, logd is monotonic time\n");
         return;
     }

logd/LogBuffer.cpp

@@ -128,7 +128,7 @@ void LogBuffer::init() {
         }
     }
     bool lastMonotonic = monotonic;
-    monotonic = android_log_clockid() == CLOCK_MONOTONIC;
+    monotonic = android_log_timestamp() == 'm';
     if (lastMonotonic == monotonic) {
         return;
     }
@@ -167,7 +167,7 @@ void LogBuffer::init() {
 }
 
 LogBuffer::LogBuffer(LastLogTimes *times):
-        monotonic(android_log_clockid() == CLOCK_MONOTONIC),
+        monotonic(android_log_timestamp() == 'm'),
         mTimes(*times) {
     pthread_mutex_init(&mLogElementsLock, NULL);