Changeset 15983 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Jan 16, 2009 9:23:30 AM (16 years ago)

Author:

vboxsync

Message:

XPCOM: code cleanup and logging in ipcDConnectService.

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (4 diffs)

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

@@ -2797 +2797 @@
   {
     nsAutoLock lock(mLock);
-#ifdef VBOX /* tracking an illegal join in Shutdown. */
+    /* tracking an illegal join in Shutdown. */
     NS_ASSERTION(!mDisconnected, "CreateWorker racing Shutdown");
-#endif
     if (!mWorkers.AppendElement(worker))
       rv = NS_ERROR_OUT_OF_MEMORY;
@@ -2858 +2857 @@
   nsresult rv;
 
+  LOG(("ipcDConnectService::Init.\n"));
+
   rv = IPC_DefineTarget(kDConnectTargetID, this);
   if (NS_FAILED(rv))
@@ -2902 +2903 @@
     return NS_ERROR_OUT_OF_MEMORY;
 
-#ifdef VBOX
   /* The DConnectWorker::Run method checks the ipcDConnectService::mDisconnected.
    * So mDisconnect must be set here to avoid an immediate exit of the worker thread.
    */
   mDisconnected = PR_FALSE;
-#endif /* VBOX */
 
   // create a single worker thread
   rv = CreateWorker();
   if (NS_FAILED(rv))
-#ifndef VBOX
-    return rv;
-#else /* VBOX */
   {
     mDisconnected = PR_TRUE;
     return rv;
   }
-#endif /* VBOX */
 
 #endif
@@ -2926 +2921 @@
   mInstance = this;
 
+  LOG(("ipcDConnectService::Init NS_OK.\n"));
   return NS_OK;
 }