commit dfc47e86858ea67c72f1df2fdb97094b8e8248f2
author Mark Salyzyn <salyzyn@google.com> Mon Mar 24 10:26:47 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Apr 17 16:14:24 2014 +0000
tree 749adb2e006a75d4deb2fb769b0dd7b6bc8d2914
parent 26bb9970c463eb1209803d833799f128484864ac

logd: libsysutils: logd startup outside init environment

Change-Id: I3426b6c3eebdd0c8258e966dcaaaa2825d7a23d1

logd/LogReader.cpp

diff --git a/logd/LogReader.cpp b/logd/LogReader.cpp
index 60a3507..51aa2ad 100644
--- a/logd/LogReader.cpp
+++ b/logd/LogReader.cpp
@@ -17,13 +17,14 @@
 #include <ctype.h>
 #include <poll.h>
 #include <sys/socket.h>
+
 #include <cutils/sockets.h>
 
 #include "LogReader.h"
 #include "FlushCommand.h"
 
 LogReader::LogReader(LogBuffer *logbuf)
-        : SocketListener("logdr", true)
+        : SocketListener(getLogSocket(), true)
         , mLogbuf(*logbuf)
 { }
 
@@ -167,3 +168,16 @@
     }
     LogTimeEntry::unlock();
 }
+
+int LogReader::getLogSocket() {
+    static const char socketName[] = "logdr";
+    int sock = android_get_control_socket(socketName);
+
+    if (sock < 0) {
+        sock = socket_local_server(socketName,
+                                   ANDROID_SOCKET_NAMESPACE_RESERVED,
+                                   SOCK_SEQPACKET);
+    }
+
+    return sock;
+}