Changeset 46435 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd

Timestamp:

Jun 7, 2013 11:37:03 AM (12 years ago)

Author:

vboxsync

Message:

ipcd: Avoid unnecessary work when logging is disabled.

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

• client/src/ipcdclient.cpp (modified) (1 diff)
• extensions/dconnect/src/ipcDConnectService.cpp (modified) (10 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp

@@ -1310 +1310 @@
 
 #ifdef IPC_LOGGING
+  if (IPC_LOG_ENABLED())
   {
     char *targetStr = target.ToString();

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -1581 +1581 @@
 
   nsrefcnt count = AddRef();
-  mRefCntLevels.Push((void *) count);
+  mRefCntLevels.Push((void *)(uintptr_t) count);
   return count;
 }
@@ -2239 +2239 @@
 {
 #ifdef IPC_LOGGING
-  const char *name = NULL;
-  mIInfo->GetNameShared(&name);
-  LOG(("{%p} DConnectStub::<dtor>(): peer=%d instance=0x%Lx {%s}\n",
-       this, mPeerID, mInstance, name));
+  if (IPC_LOG_ENABLED())
+  {
+    const char *name = NULL;
+    mIInfo->GetNameShared(&name);
+    LOG(("{%p} DConnectStub::<dtor>(): peer=%d instance=0x%Lx {%s}\n",
+         this, mPeerID, mInstance, name));
+  }
 #endif
 
@@ -2280 +2283 @@
 
     #ifdef IPC_LOGGING
-    const char *name;
-    mIInfo->GetNameShared(&name);
-    LOG(("{%p} DConnectStub::Release(): peer=%d instance=0x%Lx {%s}, new count=%d\n",
-        this, mPeerID, mInstance, name, count));
+    if (IPC_LOG_ENABLED())
+    {
+      const char *name;
+      mIInfo->GetNameShared(&name);
+      LOG(("{%p} DConnectStub::Release(): peer=%d instance=0x%Lx {%s}, new count=%d\n",
+          this, mPeerID, mInstance, name, count));
+    }
     #endif
 
@@ -2438 +2444 @@
 
 #ifdef IPC_LOGGING
+  if (IPC_LOG_ENABLED())
   {
     const char *name;
@@ -2524 +2531 @@
 
 #ifdef IPC_LOGGING
-  const char *name;
-  nsCOMPtr<nsIInterfaceInfo> iinfo;
-  GetInterfaceInfo(getter_AddRefs(iinfo));
-  iinfo->GetNameShared(&name);
-  LOG(("  instance=0x%Lx {%s}\n", mInstance, name));
-  LOG(("  name=%s\n", aInfo->GetName()));
-  LOG(("  param-count=%u\n", (PRUint32) paramCount));
+  if (IPC_LOG_ENABLED())
+  {
+    const char *name;
+    nsCOMPtr<nsIInterfaceInfo> iinfo;
+    GetInterfaceInfo(getter_AddRefs(iinfo));
+    iinfo->GetNameShared(&name);
+    LOG(("  instance=0x%Lx {%s}\n", mInstance, name));
+    LOG(("  name=%s\n", aInfo->GetName()));
+    LOG(("  param-count=%u\n", (PRUint32) paramCount));
+  }
 #endif
 
@@ -3013 +3023 @@
 
 #ifdef IPC_LOGGING
-  const char *name;
-  aData->InterfaceInfo()->GetNameShared(&name);
-  LOG(("ipcDConnectService: WARNING: deleting unreleased "
-       "instance=%p iface=%p {%s}\n", aData, aData->RealInstance(), name));
+  if (IPC_LOG_ENABLED())
+  {
+    const char *name;
+    aData->InterfaceInfo()->GetNameShared(&name);
+    LOG(("ipcDConnectService: WARNING: deleting unreleased "
+         "instance=%p iface=%p {%s}\n", aData, aData->RealInstance(), name));
+  }
 #endif
 
@@ -3258 +3271 @@
 {
 #ifdef IPC_LOGGING
-  const char *name;
-  wrapper->InterfaceInfo()->GetNameShared(&name);
-  LOG(("ipcDConnectService::StoreInstance(): instance=%p iface=%p {%s}\n",
-       wrapper, wrapper->RealInstance(), name));
+  if (IPC_LOG_ENABLED())
+  {
+    const char *name;
+    wrapper->InterfaceInfo()->GetNameShared(&name);
+    LOG(("ipcDConnectService::StoreInstance(): instance=%p iface=%p {%s}\n",
+         wrapper, wrapper->RealInstance(), name));
+  }
 #endif
 
@@ -3283 +3299 @@
 
 #ifdef IPC_LOGGING
-  const char *name;
-  wrapper->InterfaceInfo()->GetNameShared(&name);
-  LOG(("ipcDConnectService::DeleteInstance(): instance=%p iface=%p {%s}\n",
-       wrapper, wrapper->RealInstance(), name));
+  if (IPC_LOG_ENABLED())
+  {
+    const char *name;
+    wrapper->InterfaceInfo()->GetNameShared(&name);
+    LOG(("ipcDConnectService::DeleteInstance(): instance=%p iface=%p {%s}\n",
+         wrapper, wrapper->RealInstance(), name));
+  }
 #endif
 
@@ -3325 +3344 @@
 {
 #ifdef IPC_LOGGING
-  const char *name;
-  nsCOMPtr<nsIInterfaceInfo> iinfo;
-  stub->GetInterfaceInfo(getter_AddRefs(iinfo));
-  iinfo->GetNameShared(&name);
-  LOG(("ipcDConnectService::StoreStub(): stub=%p instance=0x%Lx {%s}\n",
-       stub, stub->Instance(), name));
+  if (IPC_LOG_ENABLED())
+  {
+    const char *name;
+    nsCOMPtr<nsIInterfaceInfo> iinfo;
+    stub->GetInterfaceInfo(getter_AddRefs(iinfo));
+    iinfo->GetNameShared(&name);
+    LOG(("ipcDConnectService::StoreStub(): stub=%p instance=0x%Lx {%s}\n",
+         stub, stub->Instance(), name));
+  }
 #endif
 
@@ -3341 +3363 @@
 {
 #ifdef IPC_LOGGING
-  const char *name;
-  nsCOMPtr<nsIInterfaceInfo> iinfo;
-  stub->GetInterfaceInfo(getter_AddRefs(iinfo));
-  iinfo->GetNameShared(&name);
-  LOG(("ipcDConnectService::DeleteStub(): stub=%p instance=0x%Lx {%s}\n",
-       stub, stub->Instance(), name));
+  if (IPC_LOG_ENABLED())
+  {
+    const char *name;
+    nsCOMPtr<nsIInterfaceInfo> iinfo;
+    stub->GetInterfaceInfo(getter_AddRefs(iinfo));
+    iinfo->GetNameShared(&name);
+    LOG(("ipcDConnectService::DeleteStub(): stub=%p instance=0x%Lx {%s}\n",
+         stub, stub->Instance(), name));
+  }
 #endif