Bug 1110669: Fix coding style of |RilConsumer| and it's helpers, r=htsai
authorThomas Zimmermann <tdz@users.sourceforge.net>
Wed, 07 Jan 2015 11:19:59 +0100
changeset 248255 9a9147872e5bd54decba097f965fdb9dfb86c028
parent 248254 37b3e957eda80b2b36b20166ffd3bf858e3290b0
child 248256 14e25d5825f7b562a7458d972e42d1a511e17d32
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershtsai
bugs1110669
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1110669: Fix coding style of |RilConsumer| and it's helpers, r=htsai This patch fixes the coding style in ipc/Ril.{cpp,h}. No functional changes are made.
ipc/ril/Ril.cpp
ipc/ril/Ril.h
--- a/ipc/ril/Ril.cpp
+++ b/ipc/ril/Ril.cpp
@@ -1,10 +1,10 @@
-/* -*- 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>
@@ -35,188 +35,186 @@ const char* RIL_SOCKET_NAME = "/dev/sock
 // desktop development.
 const uint32_t RIL_TEST_PORT = 6200;
 
 nsTArray<nsRefPtr<mozilla::ipc::RilConsumer> > sRilConsumers;
 
 class ConnectWorkerToRIL : public WorkerTask
 {
 public:
-    ConnectWorkerToRIL()
-    { }
+  ConnectWorkerToRIL()
+  { }
 
-    virtual bool RunTask(JSContext *aCx);
+  virtual bool RunTask(JSContext* aCx);
 };
 
 class SendRilSocketDataTask : public nsRunnable
 {
 public:
-    SendRilSocketDataTask(unsigned long aClientId,
-                          UnixSocketRawData *aRawData)
-        : mRawData(aRawData)
-        , mClientId(aClientId)
-    { }
-
-    NS_IMETHOD Run()
-    {
-        MOZ_ASSERT(NS_IsMainThread());
+  SendRilSocketDataTask(unsigned long aClientId,
+                        UnixSocketRawData* aRawData)
+    : mRawData(aRawData)
+    , mClientId(aClientId)
+  { }
 
-        if (sRilConsumers.Length() <= mClientId ||
-            !sRilConsumers[mClientId] ||
-            sRilConsumers[mClientId]->GetConnectionStatus() != SOCKET_CONNECTED) {
-            // Probably shuting down.
-            delete mRawData;
-            return NS_OK;
-        }
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
 
-        sRilConsumers[mClientId]->SendSocketData(mRawData);
-        return NS_OK;
+    if (sRilConsumers.Length() <= mClientId ||
+        !sRilConsumers[mClientId] ||
+        sRilConsumers[mClientId]->GetConnectionStatus() != SOCKET_CONNECTED) {
+      // Probably shuting down.
+      delete mRawData;
+      return NS_OK;
     }
 
+    sRilConsumers[mClientId]->SendSocketData(mRawData);
+    return NS_OK;
+  }
+
 private:
-    UnixSocketRawData *mRawData;
-    unsigned long mClientId;
+  UnixSocketRawData* mRawData;
+  unsigned long mClientId;
 };
 
 bool
-PostToRIL(JSContext *aCx,
-          unsigned aArgc,
-          JS::Value *aVp)
+PostToRIL(JSContext* aCx, unsigned aArgc, JS::Value* aVp)
 {
-    JS::CallArgs args = JS::CallArgsFromVp(aArgc, aVp);
-    NS_ASSERTION(!NS_IsMainThread(), "Expecting to be on the worker thread");
+  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;
+  }
 
-    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;
+
+  if (v.isString()) {
+    JSAutoByteString abs;
+    JS::Rooted<JSString*> str(aCx, v.toString());
+    if (!abs.encodeUtf8(aCx, str)) {
+      return false;
     }
 
-    int clientId = args[0].toInt32();
-    JS::Value v = args[1];
-
-    UnixSocketRawData* raw = nullptr;
-
-    if (v.isString()) {
-        JSAutoByteString abs;
-        JS::Rooted<JSString*> str(aCx, v.toString());
-        if (!abs.encodeUtf8(aCx, str)) {
-            return false;
-        }
+    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;
+    }
 
-        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;
+    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;
     }
 
-    if (!raw) {
-        JS_ReportError(aCx, "Unable to post to RIL");
-        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;
+  }
 
-    nsRefPtr<SendRilSocketDataTask> task =
-        new SendRilSocketDataTask(clientId, raw);
-    NS_DispatchToMainThread(task);
-    return true;
+  if (!raw) {
+    JS_ReportError(aCx, "Unable to post to RIL");
+    return false;
+  }
+
+  nsRefPtr<SendRilSocketDataTask> task = new SendRilSocketDataTask(clientId,
+                                                                   raw);
+  NS_DispatchToMainThread(task);
+  return true;
 }
 
 bool
-ConnectWorkerToRIL::RunTask(JSContext *aCx)
+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));
+  // 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;
-    }
+  // 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;
-    }
+  // 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);
+  return !!JS_DefineFunction(aCx, workerGlobal, "postRILMessage",
+                             PostToRIL, 2, 0);
 }
 
 class DispatchRILEvent : public WorkerTask
 {
 public:
-        DispatchRILEvent(unsigned long aClient,
-                         UnixSocketRawData* aMessage)
-            : mClientId(aClient)
-            , mMessage(aMessage)
-        { }
+  DispatchRILEvent(unsigned long aClient, UnixSocketRawData* aMessage)
+    : mClientId(aClient)
+    , mMessage(aMessage)
+  { }
 
-        virtual bool RunTask(JSContext *aCx);
+  virtual bool RunTask(JSContext* aCx);
 
 private:
-        unsigned long mClientId;
-        nsAutoPtr<UnixSocketRawData> mMessage;
+  unsigned long mClientId;
+  nsAutoPtr<UnixSocketRawData> mMessage;
 };
 
 bool
-DispatchRILEvent::RunTask(JSContext *aCx)
+DispatchRILEvent::RunTask(JSContext* aCx)
 {
-    JS::Rooted<JSObject*> obj(aCx, JS::CurrentGlobalOrNull(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::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::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);
+  JS::Rooted<JS::Value> rval(aCx);
+  return JS_CallFunctionName(aCx, obj, "onRILMessage", args, &rval);
 }
 
 class RilConnector : public mozilla::ipc::UnixSocketConnector
 {
 public:
-  RilConnector(unsigned long aClientId) : mClientId(aClientId)
-  {}
+  RilConnector(unsigned long aClientId)
+    : mClientId(aClientId)
+  { }
 
   virtual ~RilConnector()
-  {}
+  { }
 
   virtual int Create();
   virtual bool CreateAddr(bool aIsServer,
                           socklen_t& aAddrSize,
                           sockaddr_any& aAddr,
                           const char* aAddress);
   virtual bool SetUp(int aFd);
   virtual bool SetUpListenSocket(int aFd);
@@ -225,189 +223,188 @@ public:
 
 private:
   unsigned long mClientId;
 };
 
 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
 RilConnector::CreateAddr(bool aIsServer,
                          socklen_t& aAddrSize,
                          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 = htonl(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;
+  // Nothing to do here.
+  return true;
 }
 
 void
-RilConnector::GetSocketAddr(const sockaddr_any& aAddr,
-                            nsAString& aAddrStr)
+RilConnector::GetSocketAddr(const sockaddr_any& aAddr, nsAString& aAddrStr)
 {
-    MOZ_CRASH("This should never be called!");
+  MOZ_CRASH("This should never be called!");
 }
 
 } // anonymous namespace
 
 namespace mozilla {
 namespace ipc {
 
 RilConsumer::RilConsumer(unsigned long aClientId,
                          WorkerCrossThreadDispatcher* aDispatcher)
-    : mDispatcher(aDispatcher)
-    , mClientId(aClientId)
-    , mShutdown(false)
+  : 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;
-    }
+  // 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;
+  }
 
-    ConnectSocket(new RilConnector(mClientId), mAddress.get());
+  ConnectSocket(new RilConnector(mClientId), mAddress.get());
 }
 
 nsresult
 RilConsumer::Register(unsigned int aClientId,
                       WorkerCrossThreadDispatcher* aDispatcher)
 {
-    MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(NS_IsMainThread());
 
-    sRilConsumers.EnsureLengthAtLeast(aClientId + 1);
+  sRilConsumers.EnsureLengthAtLeast(aClientId + 1);
 
-    if (sRilConsumers[aClientId]) {
-        NS_WARNING("RilConsumer already registered");
-        return NS_ERROR_FAILURE;
-    }
+  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;
-    }
+  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;
+  // Now that we're set up, connect ourselves to the RIL thread.
+  sRilConsumers[aClientId] = new RilConsumer(aClientId, aDispatcher);
+  return NS_OK;
 }
 
 void
 RilConsumer::Shutdown()
 {
-    MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(NS_IsMainThread());
 
-    for (unsigned long i = 0; i < sRilConsumers.Length(); i++) {
-        nsRefPtr<RilConsumer>& instance = sRilConsumers[i];
-        if (!instance) {
-            continue;
-        }
+  for (unsigned long i = 0; i < sRilConsumers.Length(); i++) {
+    nsRefPtr<RilConsumer>& instance = sRilConsumers[i];
+    if (!instance) {
+      continue;
+    }
 
-        instance->mShutdown = true;
-        instance->CloseSocket();
-        instance = nullptr;
-    }
+    instance->mShutdown = true;
+    instance->CloseSocket();
+    instance = nullptr;
+  }
 }
 
 void
 RilConsumer::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage)
 {
-    MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(NS_IsMainThread());
 
-    nsRefPtr<DispatchRILEvent> dre(new DispatchRILEvent(mClientId, aMessage.forget()));
-    mDispatcher->PostTask(dre);
+  nsRefPtr<DispatchRILEvent> dre(new DispatchRILEvent(mClientId, aMessage.forget()));
+  mDispatcher->PostTask(dre);
 }
 
 void
 RilConsumer::OnConnectSuccess()
 {
-    // Nothing to do here.
-    CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
+  // Nothing to do here.
+  CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
 }
 
 void
 RilConsumer::OnConnectError()
 {
-    CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
-    CloseSocket();
+  CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
+  CloseSocket();
 }
 
 void
 RilConsumer::OnDisconnect()
 {
-    CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
-    if (!mShutdown) {
-        ConnectSocket(new RilConnector(mClientId), mAddress.get(),
-                      GetSuggestedConnectDelayMs());
-    }
+  CHROMIUM_LOG("RIL[%lu]: %s\n", mClientId, __FUNCTION__);
+  if (!mShutdown) {
+    ConnectSocket(new RilConnector(mClientId), mAddress.get(),
+                  GetSuggestedConnectDelayMs());
+  }
 }
 
 } // namespace ipc
 } // namespace mozilla
--- a/ipc/ril/Ril.h
+++ b/ipc/ril/Ril.h
@@ -1,10 +1,10 @@
-/* -*- 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/. */
 
 #ifndef mozilla_ipc_Ril_h
 #define mozilla_ipc_Ril_h 1
 
 #include <mozilla/dom/workers/Workers.h>