commit 6ac369a8381a61fef594cd64c4ee89c7919cf00d
author Matthew Xie <mattx@google.com> Wed Jul 02 06:29:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 02 06:29:09 2014 +0000
tree 981f3e7f9fbf64ea6beef9cd9928728428e32672
parent 5ded33915f458e2de4a3a459b7b893ac9b57dd32
parent 23ae7c526b529cf1c76c4a4cc8a341545493404d

am 23ae7c52: Merge "Added code to reuse the signal fds and avoid fd close" into klp-wireless-dev

* commit '23ae7c526b529cf1c76c4a4cc8a341545493404d':
  Added code to reuse the signal fds and avoid fd close

btif/src/btif_hl.c

diff --git a/btif/src/btif_hl.c b/btif/src/btif_hl.c
index 0a85e1a..153cb5b 100644
--- a/btif/src/btif_hl.c
+++ b/btif/src/btif_hl.c
@@ -89,7 +89,7 @@
 static int listen_s = -1;
 static int connected_s = -1;
 static int select_thread_id = -1;
-static int signal_fds[2];
+static int signal_fds[2] = { -1, -1 };
 static BUFFER_Q soc_queue;
 static int reg_counter;
 
@@ -4902,8 +4902,8 @@
 **
 *******************************************************************************/
 static inline int btif_hl_select_wakeup_init(fd_set* set){
-    BTIF_TRACE_DEBUG("btif_hl_select_wakeup_init");
-    if (socketpair(AF_UNIX, SOCK_STREAM, 0, signal_fds) < 0)
+    BTIF_TRACE_DEBUG0("btif_hl_select_wakeup_init");
+    if (signal_fds[0] == -1 && socketpair(AF_UNIX, SOCK_STREAM, 0, signal_fds) < 0)
     {
         BTIF_TRACE_ERROR("socketpair failed: %s", strerror(errno));
         return -1;
@@ -4969,17 +4969,6 @@
             select_thread_id = -1;
         }
     }
-   /* Cleanup signal sockets */
-    if(signal_fds[0] != -1)
-    {
-        close(signal_fds[0]);
-        signal_fds[0] = -1;
-    }
-    if(signal_fds[1] != -1)
-    {
-        close(signal_fds[1]);
-        signal_fds[1] = -1;
-    }
     return result;
 }