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

Timestamp:

Jun 29, 2010 5:16:07 PM (15 years ago)

Author:

vboxsync

Message:

webservice/xpcom: merge r63212, r63211, r63209 from 3.2 branch

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

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

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

@@ -1347 +1347 @@
     nsMemory::Free(targetStr);
 
-    IPC_LogBinary((const PRUint8 *) msg->Data(), msg->DataLen());
+//     IPC_LogBinary((const PRUint8 *) msg->Data(), msg->DataLen());
   }
 #endif

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

@@ -2261 +2261 @@
     NS_LOG_RELEASE(this, count, "DConnectStub");
 
+
+    #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));
+    #endif
+
     // mRefCntLevels may already be empty here (due to the "stabilize" trick below)
     if (mRefCntLevels.GetSize() > 0)
@@ -2498 +2506 @@
   PRUint8 i, paramCount = aInfo->GetParamCount();
 
-  LOG(("  instance=0x%Lx\n", mInstance));
+#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));
+#endif
+
 
   ipcMessageWriter writer(16 * paramCount);