From ceb3f29bcca73b765f49517c3b1241dbe4c25f28 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <tdz@users.sourceforge.net>
Date: Wed, 26 Feb 2014 17:52:18 +0100
Subject: [PATCH] Bug 974410: Cleanup UnixSocketImpl, r=kyle

This patch cleans up the implementation of UnixSocketImpl by

 - inlining all calls to SetUpIO,
 - removing the unsued constant SOCKET_RETRY_TIME_MS, and
 - separating logging from Bluetooth.
---
 ipc/unixsocket/UnixSocket.cpp | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/ipc/unixsocket/UnixSocket.cpp b/ipc/unixsocket/UnixSocket.cpp
index 3cf5c13e2d2..762b22ecfd1 100644
--- a/ipc/unixsocket/UnixSocket.cpp
+++ b/ipc/unixsocket/UnixSocket.cpp
@@ -28,14 +28,12 @@ static const size_t MAX_READ_SIZE = 1 << 16;
 #undef CHROMIUM_LOG
 #if defined(MOZ_WIDGET_GONK)
 #include <android/log.h>
-#define CHROMIUM_LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "GonkDBus", args);
+#define CHROMIUM_LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "I/O", args);
 #else
-#define BTDEBUG true
-#define CHROMIUM_LOG(args...) if (BTDEBUG) printf(args);
+#define IODEBUG true
+#define CHROMIUM_LOG(args...) if (IODEBUG) printf(args);
 #endif
 
-static const int SOCKET_RETRY_TIME_MS = 1000;
-
 namespace mozilla {
 namespace ipc {
 
@@ -94,15 +92,6 @@ public:
     mShuttingDownOnIOThread = true;
   }
 
-  void SetUpIO()
-  {
-    MOZ_ASSERT(IsOpen());
-    AddWatchers(READ_WATCHER, true);
-    if (!mOutgoingQ.IsEmpty()) {
-      AddWatchers(WRITE_WATCHER, false);
-    }
-  }
-
   void SetDelayedConnectTask(CancelableTask* aTask)
   {
     MOZ_ASSERT(NS_IsMainThread());
@@ -561,7 +550,10 @@ UnixSocketImpl::OnAccepted(int aFd)
     new OnSocketEventTask(this, OnSocketEventTask::CONNECT_SUCCESS);
   NS_DispatchToMainThread(t);
 
-  SetUpIO();
+  AddWatchers(READ_WATCHER, true);
+  if (!mOutgoingQ.IsEmpty()) {
+    AddWatchers(WRITE_WATCHER, false);
+  }
 }
 
 void
@@ -586,7 +578,10 @@ UnixSocketImpl::OnConnected()
     new OnSocketEventTask(this, OnSocketEventTask::CONNECT_SUCCESS);
   NS_DispatchToMainThread(t);
 
-  SetUpIO();
+  AddWatchers(READ_WATCHER, true);
+  if (!mOutgoingQ.IsEmpty()) {
+    AddWatchers(WRITE_WATCHER, false);
+  }
 }
 
 void
@@ -601,7 +596,7 @@ UnixSocketImpl::OnListening()
     return;
   }
 
-  SetUpIO();
+  AddWatchers(READ_WATCHER, true);
 }
 
 void