commit d26b2cacadc3f0cc143b3afd392f6a0135dc16bd
author Mark Salyzyn <salyzyn@google.com> Tue Feb 23 08:55:43 2016 -0800
committer Mark Salyzyn <salyzyn@google.com> Thu Feb 25 12:43:12 2016 -0800
tree 12ddaa7130c8c1194f3895986136cd7a6259dbd2
parent 317bfb923c12af688d18fc9a3580dff201b2482b

logd: sock_alloc_send_pskb starves pruning

(cherry pick from commit 5c77ad55d0cdee84cd45fd5d0d066f3c61d76ce6)

Allow socket send syscall to terminate after 32 seconds if reader
stalled because of memory pressure allocating new network buffers

Add a gTest to catch regressions, add security buffer to log_dump

Bug: 27242723
Change-Id: Idaa6699d9d284e7f5f723ae0e76b3d6aa3371489

logd/LogReader.cpp

diff --git a/logd/LogReader.cpp b/logd/LogReader.cpp
index 1636237..2c07984 100644
--- a/logd/LogReader.cpp
+++ b/logd/LogReader.cpp
@@ -18,6 +18,7 @@
 #include <poll.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 
 #include <cutils/sockets.h>
 
@@ -179,6 +180,11 @@
     }
 
     FlushCommand command(*this, nonBlock, tail, logMask, pid, sequence, timeout);
+
+    // Set acceptable upper limit to wait for slow reader processing b/27242723
+    struct timeval t = { LOGD_SNDTIMEO, 0 };
+    setsockopt(cli->getSocket(), SOL_SOCKET, SO_SNDTIMEO, (const char *)&t, sizeof(t));
+
     command.runSocketCommand(cli);
     return true;
 }