commit ed3b0f8c9da87fef400c12040044998be0582543
author Mark Salyzyn <salyzyn@google.com> Mon Sep 29 22:17:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 29 22:17:09 2014 +0000
tree f6ec9a85b671f99245a48849e200ba558ff60562
parent 0c3436e069254b11af13c4da87a72cdc343e4c7f
parent c4133a6e28e586f598e5c92f2b9e769178d92b3f

am c4133a6e: am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization"

* commit 'c4133a6e28e586f598e5c92f2b9e769178d92b3f':
  logd: in nonblocking read, sched_yield() synchronization

logd/LogReader.cpp

diff --git a/logd/LogReader.cpp b/logd/LogReader.cpp
index 8458c19..26df087 100644
--- a/logd/LogReader.cpp
+++ b/logd/LogReader.cpp
@@ -92,6 +92,11 @@
 
     bool nonBlock = false;
     if (strncmp(buffer, "dumpAndClose", 12) == 0) {
+        // Allow writer to get some cycles, and wait for pending notifications
+        sched_yield();
+        LogTimeEntry::lock();
+        LogTimeEntry::unlock();
+        sched_yield();
         nonBlock = true;
     }