commit 6aedf1d3d43e1df187991955c0136e2d6a536e4f
author Mark Salyzyn <salyzyn@google.com> Thu Jan 09 18:08:52 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 09 18:08:52 2014 +0000
tree a05e5ea48ac8c1aa786785eb9e66936a6c6c46ba
parent 4f3c6aed7ba2227c49e28f89d600177cf1d61d83
parent 080bbfab94ce91e4845860d5253eea6d869bbc18

Merge "liblog: high CPU usage from logcat"

liblog/log_read.c

diff --git a/liblog/log_read.c b/liblog/log_read.c
index 11464ce..379105f 100644
--- a/liblog/log_read.c
+++ b/liblog/log_read.c
@@ -1,5 +1,5 @@
 /*
-** Copyright 2013, The Android Open Source Project
+** Copyright 2013-2014, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -31,7 +31,9 @@
 
 #define LOG_FILE_DIR "/dev/log/"
 
-#define LOG_TIMEOUT_MS 5
+/* timeout in milliseconds */
+#define LOG_TIMEOUT_FLUSH 5
+#define LOG_TIMEOUT_NEVER -1
 
 #define logger_for_each(logger, logger_list) \
     for (logger = node_to_item((logger_list)->node.next, struct logger, node); \
@@ -291,7 +293,7 @@
     list_init(&logger->log_list);
     list_add_tail(&logger_list->node, &logger->node);
     logger->top = logger_list;
-    logger_list->timeout_ms = LOG_TIMEOUT_MS;
+    logger_list->timeout_ms = LOG_TIMEOUT_FLUSH;
     goto ok;
 
 err_name:
@@ -494,14 +496,14 @@
             } else if (logger_list->mode & O_NDELAY) {
                 error = EAGAIN;
             } else {
-                logger_list->timeout_ms = 0;
+                logger_list->timeout_ms = LOG_TIMEOUT_NEVER;
             }
 
             logger_list->flush = true;
             goto try_flush;
         }
 
-        logger_list->timeout_ms = LOG_TIMEOUT_MS;
+        logger_list->timeout_ms = LOG_TIMEOUT_FLUSH;
 
         /* Anti starvation */
         if (!logger_list->flush