commit 63b812fb20f1a46cb98337bb728053f464e41aea
author Yang Ni <yangni@google.com> Thu Apr 20 21:55:49 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 20 21:55:50 2017 +0000
tree 12c06f993458374832ec20be0f040c3bb6c7e417
parent 1bc0fee3ba535b5268c061381ad0da51734fedd1
parent 75fe0f8978ded1e10e64dee108b7870aee6f1189

Merge "Handle socket creation error in context init"

rsContext.cpp

diff --git a/rsContext.cpp b/rsContext.cpp
index da4262f..3be600e 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -497,7 +497,10 @@
 bool Context::initContext(Device *dev, const RsSurfaceConfig *sc) {
     pthread_mutex_lock(&gInitMutex);
 
-    mIO.init();
+    if (!mIO.init()) {
+        ALOGE("Failed initializing IO Fifo");
+        return false;
+    }
     mIO.setTimeoutCallback(printWatchdogInfo, this, 2e9);
 
     if (sc) {

rsFifoSocket.cpp

diff --git a/rsFifoSocket.cpp b/rsFifoSocket.cpp
index 5475f92..af61380 100644
--- a/rsFifoSocket.cpp
+++ b/rsFifoSocket.cpp
@@ -36,7 +36,6 @@
 }
 
 bool FifoSocket::init(bool supportNonBlocking, bool supportReturnValues, size_t maxDataSize) {
-    // TODO: (b/27870945) Handle socketpair errors.
     int ret = socketpair(AF_UNIX, SOCK_STREAM, 0, sv);
     return (ret == 0);
 }

rsThreadIO.cpp

diff --git a/rsThreadIO.cpp b/rsThreadIO.cpp
index ceec54a..e041877 100644
--- a/rsThreadIO.cpp
+++ b/rsThreadIO.cpp
@@ -37,9 +37,8 @@
 ThreadIO::~ThreadIO() {
 }
 
-void ThreadIO::init() {
-    mToClient.init();
-    mToCore.init();
+bool ThreadIO::init() {
+    return mToClient.init() && mToCore.init();
 }
 
 void ThreadIO::shutdown() {

rsThreadIO.h

diff --git a/rsThreadIO.h b/rsThreadIO.h
index 23c5d42..cfae09d 100644
--- a/rsThreadIO.h
+++ b/rsThreadIO.h
@@ -31,7 +31,7 @@
     ThreadIO();
     ~ThreadIO();
 
-    void init();
+    bool init();
     void shutdown();
 
     size_t getMaxInlineSize() {