Base import of Tycho code (warning: huge commit)

4 files changed, 314 insertions, 145 deletions

diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in
deleted file mode 100644
index cc3792182..000000000
--- a/ipc/ril/Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME = mozril_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-EXPORT_LIBRARY = 1
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
-include $(topsrcdir)/config/rules.mk
diff --git a/ipc/ril/Ril.cpp b/ipc/ril/Ril.cpp
index 79009b9f2..e979e020a 100644
--- a/ipc/ril/Ril.cpp
+++ b/ipc/ril/Ril.cpp
@@ -1,83 +1,220 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set sw=4 ts=8 et ft=cpp: */
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/ipc/Ril.h"
+
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netdb.h> // For gethostbyname.
 
-#undef LOG
+#undef CHROMIUM_LOG
 #if defined(MOZ_WIDGET_GONK)
 #include <android/log.h>
-#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gonk", args)
+#define CHROMIUM_LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gonk", args)
 #else
-#define LOG(args...)  printf(args);
+#define CHROMIUM_LOG(args...)  printf(args);
 #endif
 
 #include "jsfriendapi.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/ipc/UnixSocketConnector.h"
+#include "nsTArray.h"
 #include "nsThreadUtils.h" // For NS_IsMainThread.
-#include "Ril.h"
 
 USING_WORKERS_NAMESPACE
 using namespace mozilla::ipc;
 
 namespace {
 
-const char* RIL_SOCKET_NAME = "/dev/socket/rilproxy";
+static const char RIL_SOCKET_NAME[] = "/dev/socket/rilproxy";
 
 // Network port to connect to for adb forwarded sockets when doing
 // desktop development.
-const uint32_t RIL_TEST_PORT = 6200;
+static const uint32_t RIL_TEST_PORT = 6200;
+
+static nsTArray<nsRefPtr<mozilla::ipc::RilConsumer> > sRilConsumers;
+
+class ConnectWorkerToRIL final : public WorkerTask
+{
+public:
+  bool RunTask(JSContext* aCx) override;
+};
 
-class DispatchRILEvent : public WorkerTask
+class SendRilSocketDataTask final : public nsRunnable
 {
 public:
-    DispatchRILEvent(UnixSocketRawData* aMessage)
-      : mMessage(aMessage)
-    { }
+  SendRilSocketDataTask(unsigned long aClientId,
+                        UnixSocketRawData* aRawData)
+    : mRawData(aRawData)
+    , mClientId(aClientId)
+  { }
+
+  NS_IMETHOD Run() override
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+
+    if (sRilConsumers.Length() <= mClientId ||
+        !sRilConsumers[mClientId] ||
+        sRilConsumers[mClientId]->GetConnectionStatus() != SOCKET_CONNECTED) {
+      // Probably shuting down.
+      delete mRawData;
+      return NS_OK;
+    }
 
-    virtual bool RunTask(JSContext *aCx);
+    sRilConsumers[mClientId]->SendSocketData(mRawData);
+    return NS_OK;
+  }
 
 private:
-    nsAutoPtr<UnixSocketRawData> mMessage;
+  UnixSocketRawData* mRawData;
+  unsigned long mClientId;
 };
 
-bool
-DispatchRILEvent::RunTask(JSContext *aCx)
+static bool
+PostToRIL(JSContext* aCx, unsigned aArgc, JS::Value* aVp)
 {
-    JSObject *obj = JS_GetGlobalForScopeChain(aCx);
+  JS::CallArgs args = JS::CallArgsFromVp(aArgc, aVp);
+  NS_ASSERTION(!NS_IsMainThread(), "Expecting to be on the worker thread");
+
+  if (args.length() != 2) {
+    JS_ReportError(aCx, "Expecting two arguments with the RIL message");
+    return false;
+  }
+
+  int clientId = args[0].toInt32();
+  JS::Value v = args[1];
+
+  UnixSocketRawData* raw = nullptr;
 
-    JSObject *array = JS_NewUint8Array(aCx, mMessage->mSize);
-    if (!array) {
-        return false;
+  if (v.isString()) {
+    JSAutoByteString abs;
+    JS::Rooted<JSString*> str(aCx, v.toString());
+    if (!abs.encodeUtf8(aCx, str)) {
+      return false;
     }
 
-    memcpy(JS_GetArrayBufferViewData(array), mMessage->mData, mMessage->mSize);
-    JS::Value argv[] = { OBJECT_TO_JSVAL(array) };
-    return JS_CallFunctionName(aCx, obj, "onRILMessage", NS_ARRAY_LENGTH(argv),
-                               argv, argv);
+    raw = new UnixSocketRawData(abs.ptr(), abs.length());
+  } else if (!v.isPrimitive()) {
+    JSObject* obj = v.toObjectOrNull();
+    if (!JS_IsTypedArrayObject(obj)) {
+      JS_ReportError(aCx, "Object passed in wasn't a typed array");
+      return false;
+    }
+
+    uint32_t type = JS_GetArrayBufferViewType(obj);
+    if (type != js::Scalar::Int8 &&
+        type != js::Scalar::Uint8 &&
+        type != js::Scalar::Uint8Clamped) {
+      JS_ReportError(aCx, "Typed array data is not octets");
+      return false;
+    }
+
+    JS::AutoCheckCannotGC nogc;
+    size_t size = JS_GetTypedArrayByteLength(obj);
+    void* data = JS_GetArrayBufferViewData(obj, nogc);
+    raw = new UnixSocketRawData(data, size);
+  } else {
+    JS_ReportError(
+      aCx, "Incorrect argument. Expecting a string or a typed array");
+    return false;
+  }
+
+  if (!raw) {
+    JS_ReportError(aCx, "Unable to post to RIL");
+    return false;
+  }
+
+  nsRefPtr<SendRilSocketDataTask> task = new SendRilSocketDataTask(clientId,
+                                                                   raw);
+  NS_DispatchToMainThread(task);
+  return true;
 }
 
-class RilConnector : public mozilla::ipc::UnixSocketConnector
+bool
+ConnectWorkerToRIL::RunTask(JSContext* aCx)
+{
+  // Set up the postRILMessage on the function for worker -> RIL thread
+  // communication.
+  NS_ASSERTION(!NS_IsMainThread(), "Expecting to be on the worker thread");
+  NS_ASSERTION(!JS_IsRunning(aCx), "Are we being called somehow?");
+  JS::Rooted<JSObject*> workerGlobal(aCx, JS::CurrentGlobalOrNull(aCx));
+
+  // Check whether |postRILMessage| has been defined.  No one but this class
+  // should ever define |postRILMessage| in a RIL worker.
+  JS::Rooted<JS::Value> val(aCx);
+  if (!JS_GetProperty(aCx, workerGlobal, "postRILMessage", &val)) {
+    JS_ReportPendingException(aCx);
+    return false;
+  }
+
+  // Make sure that |postRILMessage| is a function.
+  if (JSTYPE_FUNCTION == JS_TypeOfValue(aCx, val)) {
+    return true;
+  }
+
+  return !!JS_DefineFunction(aCx, workerGlobal, "postRILMessage",
+                             PostToRIL, 2, 0);
+}
+
+class DispatchRILEvent final : public WorkerTask
 {
 public:
-  RilConnector(unsigned long aClientId) : mClientId(aClientId)
-  {}
+  DispatchRILEvent(unsigned long aClient, UnixSocketRawData* aMessage)
+    : mClientId(aClient)
+    , mMessage(aMessage)
+  { }
 
-  virtual ~RilConnector()
-  {}
+  bool RunTask(JSContext* aCx) override;
 
-  virtual int Create();
-  virtual bool CreateAddr(bool aIsServer,
-                          socklen_t& aAddrSize,
-                          sockaddr_any& aAddr,
-                          const char* aAddress);
-  virtual bool SetUp(int aFd);
-  virtual void GetSocketAddr(const sockaddr_any& aAddr,
-                             nsAString& aAddrStr);
+private:
+  unsigned long mClientId;
+  nsAutoPtr<UnixSocketRawData> mMessage;
+};
+
+bool
+DispatchRILEvent::RunTask(JSContext* aCx)
+{
+  JS::Rooted<JSObject*> obj(aCx, JS::CurrentGlobalOrNull(aCx));
+
+  JS::Rooted<JSObject*> array(aCx,
+                              JS_NewUint8Array(aCx, mMessage->GetSize()));
+  if (!array) {
+    return false;
+  }
+  {
+    JS::AutoCheckCannotGC nogc;
+    memcpy(JS_GetArrayBufferViewData(array, nogc),
+           mMessage->GetData(), mMessage->GetSize());
+  }
+
+  JS::AutoValueArray<2> args(aCx);
+  args[0].setNumber((uint32_t)mClientId);
+  args[1].setObject(*array);
+
+  JS::Rooted<JS::Value> rval(aCx);
+  return JS_CallFunctionName(aCx, obj, "onRILMessage", args, &rval);
+}
+
+class RilConnector final : public mozilla::ipc::UnixSocketConnector
+{
+public:
+  RilConnector(unsigned long aClientId)
+    : mClientId(aClientId)
+  { }
+
+  int Create() override;
+  bool CreateAddr(bool aIsServer,
+                  socklen_t& aAddrSize,
+                  sockaddr_any& aAddr,
+                  const char* aAddress) override;
+  bool SetUp(int aFd) override;
+  bool SetUpListenSocket(int aFd) override;
+  void GetSocketAddr(const sockaddr_any& aAddr,
+                     nsAString& aAddrStr) override;
 
 private:
   unsigned long mClientId;
@@ -86,26 +223,26 @@ private:
 int
 RilConnector::Create()
 {
-    MOZ_ASSERT(!NS_IsMainThread());
+  MOZ_ASSERT(!NS_IsMainThread());
 
-    int fd = -1;
+  int fd = -1;
 
 #if defined(MOZ_WIDGET_GONK)
-    fd = socket(AF_LOCAL, SOCK_STREAM, 0);
+  fd = socket(AF_LOCAL, SOCK_STREAM, 0);
 #else
-    // If we can't hit a local loopback, fail later in connect.
-    fd = socket(AF_INET, SOCK_STREAM, 0);
+  // If we can't hit a local loopback, fail later in connect.
+  fd = socket(AF_INET, SOCK_STREAM, 0);
 #endif
 
-    if (fd < 0) {
-        NS_WARNING("Could not open ril socket!");
-        return -1;
-    }
+  if (fd < 0) {
+    NS_WARNING("Could not open ril socket!");
+    return -1;
+  }
 
-    if (!SetUp(fd)) {
-        NS_WARNING("Could not set up socket!");
-    }
-    return fd;
+  if (!SetUp(fd)) {
+    NS_WARNING("Could not set up socket!");
+  }
+  return fd;
 }
 
 bool
@@ -114,50 +251,55 @@ RilConnector::CreateAddr(bool aIsServer,
                          sockaddr_any& aAddr,
                          const char* aAddress)
 {
-    // We never open ril socket as server.
-    MOZ_ASSERT(!aIsServer);
-    uint32_t af;
+  // We never open ril socket as server.
+  MOZ_ASSERT(!aIsServer);
+  uint32_t af;
 #if defined(MOZ_WIDGET_GONK)
-    af = AF_LOCAL;
+  af = AF_LOCAL;
 #else
-    af = AF_INET;
+  af = AF_INET;
 #endif
-    switch (af) {
-    case AF_LOCAL:
-        aAddr.un.sun_family = af;
-        if(strlen(aAddress) > sizeof(aAddr.un.sun_path)) {
-            NS_WARNING("Address too long for socket struct!");
-            return false;
-        }
-        strcpy((char*)&aAddr.un.sun_path, aAddress);
-        aAddrSize = strlen(aAddress) + offsetof(struct sockaddr_un, sun_path) + 1;
-        break;
-    case AF_INET:
-        aAddr.in.sin_family = af;
-        aAddr.in.sin_port = htons(RIL_TEST_PORT + mClientId);
-        aAddr.in.sin_addr.s_addr = htons(INADDR_LOOPBACK);
-        aAddrSize = sizeof(sockaddr_in);
-        break;
-    default:
-        NS_WARNING("Socket type not handled by connector!");
-        return false;
+  switch (af) {
+  case AF_LOCAL:
+    aAddr.un.sun_family = af;
+    if(strlen(aAddress) > sizeof(aAddr.un.sun_path)) {
+      NS_WARNING("Address too long for socket struct!");
+      return false;
     }
-    return true;
+    strcpy((char*)&aAddr.un.sun_path, aAddress);
+    aAddrSize = strlen(aAddress) + offsetof(struct sockaddr_un, sun_path) + 1;
+    break;
+  case AF_INET:
+    aAddr.in.sin_family = af;
+    aAddr.in.sin_port = htons(RIL_TEST_PORT + mClientId);
+    aAddr.in.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    aAddrSize = sizeof(sockaddr_in);
+    break;
+  default:
+    NS_WARNING("Socket type not handled by connector!");
+    return false;
+  }
+  return true;
 }
 
 bool
 RilConnector::SetUp(int aFd)
 {
-    // Nothing to do here.
-    return true;
+  // Nothing to do here.
+  return true;
+}
+
+bool
+RilConnector::SetUpListenSocket(int aFd)
+{
+  // Nothing to do here.
+  return true;
 }
 
 void
-RilConnector::GetSocketAddr(const sockaddr_any& aAddr,
-                            nsAString& aAddrStr)
+RilConnector::GetSocketAddr(const sockaddr_any& aAddr, nsAString& aAddrStr)
 {
-    // Unused.
-    MOZ_NOT_REACHED("This should never be called!");
+  MOZ_CRASH("This should never be called!");
 }
 
 } // anonymous namespace
@@ -167,61 +309,102 @@ namespace ipc {
 
 RilConsumer::RilConsumer(unsigned long aClientId,
                          WorkerCrossThreadDispatcher* aDispatcher)
-    : mDispatcher(aDispatcher)
-    , mClientId(aClientId)
-    , mShutdown(false)
-{
-    // Only append client id after RIL_SOCKET_NAME when it's not connected to
-    // the first(0) rilproxy for compatibility.
-    if (!aClientId) {
-        mAddress = RIL_SOCKET_NAME;
-    } else {
-        struct sockaddr_un addr_un;
-        snprintf(addr_un.sun_path, sizeof addr_un.sun_path, "%s%lu",
-                 RIL_SOCKET_NAME, aClientId);
-        mAddress = addr_un.sun_path;
-    }
+  : mDispatcher(aDispatcher)
+  , mClientId(aClientId)
+  , mShutdown(false)
+{
+  // Only append client id after RIL_SOCKET_NAME when it's not connected to
+  // the first(0) rilproxy for compatibility.
+  if (!aClientId) {
+    mAddress = RIL_SOCKET_NAME;
+  } else {
+    struct sockaddr_un addr_un;
+    snprintf(addr_un.sun_path, sizeof addr_un.sun_path, "%s%lu",
+             RIL_SOCKET_NAME, aClientId);
+    mAddress = addr_un.sun_path;
+  }
+
+  Connect(new RilConnector(mClientId), mAddress.get());
+}
+
+nsresult
+RilConsumer::Register(unsigned int aClientId,
+                      WorkerCrossThreadDispatcher* aDispatcher)
+{
+  MOZ_ASSERT(NS_IsMainThread());
 
-    ConnectSocket(new RilConnector(mClientId), mAddress.get());
+  sRilConsumers.EnsureLengthAtLeast(aClientId + 1);
+
+  if (sRilConsumers[aClientId]) {
+    NS_WARNING("RilConsumer already registered");
+    return NS_ERROR_FAILURE;
+  }
+
+  nsRefPtr<ConnectWorkerToRIL> connection = new ConnectWorkerToRIL();
+  if (!aDispatcher->PostTask(connection)) {
+    NS_WARNING("Failed to connect worker to ril");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  // Now that we're set up, connect ourselves to the RIL thread.
+  sRilConsumers[aClientId] = new RilConsumer(aClientId, aDispatcher);
+  return NS_OK;
 }
 
 void
 RilConsumer::Shutdown()
 {
-    mShutdown = true;
-    CloseSocket();
+  MOZ_ASSERT(NS_IsMainThread());
+
+  for (unsigned long i = 0; i < sRilConsumers.Length(); i++) {
+    nsRefPtr<RilConsumer>& instance = sRilConsumers[i];
+    if (!instance) {
+      continue;
+    }
+
+    instance->mShutdown = true;
+    instance->Close();
+    instance = nullptr;
+  }
 }
 
 void
 RilConsumer::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage)
 {
-    MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(NS_IsMainThread());
 
-    nsRefPtr<DispatchRILEvent> dre(new DispatchRILEvent(aMessage.forget()));
-    mDispatcher->PostTask(dre);
+  nsRefPtr<DispatchRILEvent> dre(new DispatchRILEvent(mClientId, aMessage.forget()));
+  mDispatcher->PostTask(dre);
 }
 
 void
 RilConsumer::OnConnectSuccess()
 {
-    // Nothing to do here.
-    LOG("Socket open for RIL\n");
+  // Nothing to do here.
+  CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
 }
 
 void
 RilConsumer::OnConnectError()
 {
-    LOG("%s\n", __FUNCTION__);
-    CloseSocket();
+  CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
+  Close();
 }
 
 void
 RilConsumer::OnDisconnect()
 {
-    LOG("%s\n", __FUNCTION__);
-    if (!mShutdown) {
-        ConnectSocket(new RilConnector(mClientId), mAddress.get(), 1000);
-    }
+  CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
+  if (!mShutdown) {
+    Connect(new RilConnector(mClientId), mAddress.get(),
+            GetSuggestedConnectDelayMs());
+  }
+}
+
+ConnectionOrientedSocketIO*
+RilConsumer::GetIO()
+{
+  return PrepareAccept(new RilConnector(mClientId));
 }
 
 } // namespace ipc
diff --git a/ipc/ril/Ril.h b/ipc/ril/Ril.h
index bb4d1c7da..9af6212a4 100644
--- a/ipc/ril/Ril.h
+++ b/ipc/ril/Ril.h
@@ -1,5 +1,5 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set sw=2 ts=8 et ft=cpp: */
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -8,28 +8,31 @@
 #define mozilla_ipc_Ril_h 1
 
 #include <mozilla/dom/workers/Workers.h>
-#include <mozilla/ipc/UnixSocket.h>
+#include <mozilla/ipc/StreamSocket.h>
 
 namespace mozilla {
 namespace ipc {
 
-class RilConsumer : public mozilla::ipc::UnixSocketConsumer
+class RilConsumer final : public mozilla::ipc::StreamSocket
 {
 public:
-  RilConsumer(unsigned long aClientId,
-              mozilla::dom::workers::WorkerCrossThreadDispatcher* aDispatcher);
-  virtual ~RilConsumer() { }
+  static nsresult Register(
+    unsigned int aClientId,
+    mozilla::dom::workers::WorkerCrossThreadDispatcher* aDispatcher);
+  static void Shutdown();
 
-  void Shutdown();
+  ConnectionOrientedSocketIO* GetIO() override;
 
 private:
-  virtual void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage);
+  RilConsumer(unsigned long aClientId,
+              mozilla::dom::workers::WorkerCrossThreadDispatcher* aDispatcher);
 
-  virtual void OnConnectSuccess();
-  virtual void OnConnectError();
-  virtual void OnDisconnect();
+  void ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage) override;
+
+  void OnConnectSuccess() override;
+  void OnConnectError() override;
+  void OnDisconnect() override;
 
-private:
   nsRefPtr<mozilla::dom::workers::WorkerCrossThreadDispatcher> mDispatcher;
   unsigned long mClientId;
   nsCString mAddress;
diff --git a/ipc/ril/moz.build b/ipc/ril/moz.build
index 0ee44577f..2ab5da59e 100644
--- a/ipc/ril/moz.build
+++ b/ipc/ril/moz.build
@@ -4,13 +4,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MODULE = 'ipc'
-
 EXPORTS.mozilla.ipc += [
     'Ril.h',
 ]
 
-CPP_SOURCES += [
+SOURCES += [
     'Ril.cpp',
 ]
 
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+FAIL_ON_WARNINGS = True