Changeset 109065 in vbox

Timestamp:

Apr 24, 2025 8:14:18 AM (10 days ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168602

Message:

VBox/log.h,libs/xpcom: Added an XPCOM logging group and fixed missing newlines (++) in the logging in xpcom.

Location:

trunk

Files:

• include/VBox/log.h (modified) (2 diffs)
• src/libs/xpcom18a4/Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/ipc/ipcd/client/src/ipcConnectionUnix.cpp (modified) (1 diff)
• src/libs/xpcom18a4/ipc/ipcd/client/src/ipcDConnectService.cpp (modified) (10 diffs)
• src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp (modified) (1 diff)
• src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcClient.cpp (modified) (1 diff)
• src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcCommandModule.cpp (modified) (1 diff)
• src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcd.cpp (modified) (1 diff)
• src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp (modified) (1 diff)
• src/libs/xpcom18a4/python/src/PyISupports.cpp (modified) (1 diff)
• src/libs/xpcom18a4/xpcom/base/nsDebugImpl.cpp (modified) (1 diff)
• src/libs/xpcom18a4/xpcom/build/nsXPComInit.cpp (modified) (6 diffs)
• src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp (modified) (23 diffs)
• src/libs/xpcom18a4/xpcom/components/nsNativeComponentLoader.cpp (modified) (5 diffs)
• src/libs/xpcom18a4/xpcom/components/xcDll.cpp (modified) (2 diffs)
• src/libs/xpcom18a4/xpcom/threads/nsEventQueueService.cpp (modified) (2 diffs)
• src/libs/xpcom18a4/xpcom/threads/plevent.c (modified) (12 diffs)

trunk/include/VBox/log.h

@@ -864 +864 @@
     LOG_GROUP_VSCSI,
     /** Webservice group. */
-    LOG_GROUP_WEBSERVICE
+    LOG_GROUP_WEBSERVICE,
+    /** Generic XPCOM group.   */
+    LOG_GROUP_XPCOM
     /* !!!ALPHABETICALLY!!! */
 } VBOXLOGGROUP;
@@ -1282 +1284 @@
     "VSCSI", \
     "WEBSERVICE", \
+    "XPCOM", \
 }
 

trunk/src/libs/xpcom18a4/Config.kmk

@@ -70 +70 @@
         NDEBUG=1 \
         _IMPL_NS_COM \
-        IN_RING3
+        IN_RING3 \
+        LOG_GROUP=LOG_GROUP_XPCOM
 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
  TEMPLATE_XPComDll_DEFS              += \

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

@@ -34 +34 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#undef  LOG_GROUP
 #define LOG_GROUP LOG_GROUP_IPC
 #include <iprt/assert.h>

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

@@ -36 +36 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#undef  LOG_GROUP
 #define LOG_GROUP LOG_GROUP_IPC
 #include "ipcDConnectService.h"
@@ -934 +935 @@
        elemType.IsReference()))
   {
-    Log(("arrays of pointers and references to arithmetic types are "
-         "not yet supported\n"));
+    Log(("arrays of pointers and references to arithmetic types are not yet supported\n"));
     return NS_ERROR_NOT_IMPLEMENTED;
   }
@@ -1423 +1423 @@
   {
     const DConnectOp *op = (const DConnectOp *) aData;
-    Log((
-      "DConnectCompletion::OnMessageAvailable: "
-      "senderID=%d, opcode_major=%d, index=%d (waiting for %d)\n",
-      aSenderID, op->opcode_major, op->request_index, mSelector.mRequestIndex
-    ));
+    Log(("DConnectCompletion::OnMessageAvailable: senderID=%d, opcode_major=%d, index=%d (waiting for %d)\n",
+         aSenderID, op->opcode_major, op->request_index, mSelector.mRequestIndex));
     if (aSenderID == mSelector.mPeer &&
         op->opcode_major == mSelector.mOpCodeMajor &&
@@ -2435 +2432 @@
     if (iinfoQ) {
         iinfoQ->GetNameShared(&nameQ);
-        Log(("calling QueryInterface {%s} on peer object "
-             "(stub=%p, instance=0x%Lx {%s})\n",
+        Log(("calling QueryInterface {%s} on peer object (stub=%p, instance=0x%Lx {%s})\n",
              nameQ, this, mInstance, name));
     }
@@ -2898 +2894 @@
   const char *name;
   aData->InterfaceInfo()->GetNameShared(&name);
-  Log(("ipcDConnectService: WARNING: deleting unreleased "
-       "instance=%p iface=%p {%s}\n", aData, aData->RealInstance(), name));
+  Log(("ipcDConnectService: WARNING: deleting unreleased instance=%p iface=%p {%s}\n", aData, aData->RealInstance(), name));
 #endif
 
@@ -3273 +3268 @@
 #ifdef LOG_ENABLED
   const DConnectOp *op = (const DConnectOp *) aData;
-  Log (("ipcDConnectService::OnMessageAvailable: "
-        "senderID=%d, opcode_major=%d, index=%d\n",
-        aSenderID, op->opcode_major, op->request_index));
+  Log(("ipcDConnectService::OnMessageAvailable: senderID=%d, opcode_major=%d, index=%d\n",
+       aSenderID, op->opcode_major, op->request_index));
 #endif
 
@@ -3308 +3302 @@
     nsrefcnt countIPC = aData->ReleaseIPC(PR_TRUE /* locked */);
 
-    Log(("ipcDConnectService::PruneInstanceMapForPeer: "
-         "instance=%p: %d IPC refs to release\n",
-         aData, countIPC + 1));
+    Log(("ipcDConnectService::PruneInstanceMapForPeer: instance=%p: %d IPC refs to release\n", aData, countIPC + 1));
 
     // release all IPC instances of the "officially dead" client (see
@@ -3353 +3345 @@
     else
     {
-      Log(("ipcDConnectService::OnClientStateChange: "
-           "pruning all instances created for peer %d...\n", aClientID));
+      Log(("ipcDConnectService::OnClientStateChange: pruning all instances created for peer %d...\n", aClientID));
 
       nsVoidArray wrappers;
@@ -3366 +3357 @@
       }
 
-      Log(("ipcDConnectService::OnClientStateChange: "
-           "%d lost instances\n", wrappers.Count()));
+      Log(("ipcDConnectService::OnClientStateChange: %d lost instances\n", wrappers.Count()));
 
       // release all pending references left after PruneInstanceMapForPeer().
@@ -3655 +3645 @@
     // client gets processed here (because of true multithreading). Just log
     // a debug warning
-    Log(("ipcDConnectService::OnRelease: WARNING: "
-         "instance wrapper %p for peer %d not found", wrapper, peer));
+    Log(("ipcDConnectService::OnRelease: WARNING: instance wrapper %p for peer %d not found\n", wrapper, peer));
   }
 }

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

@@ -35 +35 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#undef  LOG_GROUP
 #define LOG_GROUP LOG_GROUP_IPC
 #include "ipcdclient.h"

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcClient.cpp

@@ -35 +35 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#undef  LOG_GROUP
 #define LOG_GROUP LOG_GROUP_IPC
 #include <iprt/asm.h>

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcCommandModule.cpp

@@ -35 +35 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#undef  LOG_GROUP
 #define LOG_GROUP LOG_GROUP_IPC
 #include <stdlib.h>

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcd.cpp

@@ -35 +35 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#undef  LOG_GROUP
 #define LOG_GROUP LOG_GROUP_IPC
 #include <iprt/assert.h>

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp

@@ -35 +35 @@
  *
  * ***** END LICENSE BLOCK ***** */
+#undef  LOG_GROUP
 #define LOG_GROUP LOG_GROUP_IPC
 

trunk/src/libs/xpcom18a4/python/src/PyISupports.cpp

@@ -55 +55 @@
 
 #ifdef VBOX_DEBUG_LIFETIMES
-# include <iprt/log.h>
+# include <VBox/log.h>
 # include <iprt/stream.h>
 

trunk/src/libs/xpcom18a4/xpcom/base/nsDebugImpl.cpp

@@ -143 +143 @@
 {
     /* Debug log. */
-    Log(("WARNING: %s, file %s, line %d", aMessage, aFile, aLine));
+    Log(("WARNING: %s, file %s, line %d\n", aMessage, aFile, aLine));
 
     // And write it out to the stdout

trunk/src/libs/xpcom18a4/xpcom/build/nsXPComInit.cpp

@@ -38 +38 @@
 #include <iprt/initterm.h>
 #include <iprt/time.h>
+#include <VBox/log.h>
 
 #include "nsXPCOM.h"
@@ -387 +388 @@
     /* Make sure IPRT is initialized. */
     RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
+    LogFlow(("NS_InitXPCOM2: done RTR3InitDll\n"));
 
      // We are not shutting down
@@ -523 +525 @@
 
     if ( NS_FAILED(rv) || CheckUpdateFile()) {
+        LogFlow(("NS_InitXPCOM2: rv=%#x or CheckUpdateFile()=>true\n", rv));
+
         // if we find no persistent registry, we will try to autoregister
         // the default components directory.
@@ -610 +614 @@
     nsIInterfaceInfoManager* iim = XPTI_GetInterfaceInfoManager();
     NS_IF_RELEASE(iim);
+
 #ifdef VBOX
     // Must initialize the EventQueueService singleton before anyone is
@@ -626 +631 @@
 
     // Notify observers of xpcom autoregistration start
+    LogFlow(("NS_InitXPCOM2: Notifying startup observers (autoreg)\n"));
     NS_CreateServicesFromCategory(NS_XPCOM_STARTUP_OBSERVER_ID,
                                   nsnull,
@@ -633 +639 @@
     gXPCOMInitialized = PR_TRUE;
 #endif
+    LogFlow(("NS_InitXPCOM2: return NS_OK\n"));
     return NS_OK;
 }

trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

@@ -963 +963 @@
 AutoRegEntry::Modified(PRInt64 *date)
 {
+    Log(("AutoRegEntry::Modified: mModDate=%RI64 vs %RI64 - %d\n", mModDate, *date, !LL_EQ(*date, mModDate)));
     return !LL_EQ(*date, mModDate);
 }
@@ -1670 +1671 @@
                                        void **aResult)
 {
-    nsresult rv;
+    LogFlow(("nsComponentManager: GetClassObject(%RTuuid)\n", &aClass));
+    Assert(aResult != nsnull);
 
     nsCOMPtr<nsIFactory> factory;
-
-#ifdef LOG_ENABLED
-    char *buf = aClass.ToString();
-    LogFlow(("nsComponentManager: GetClassObject(%s)", buf));
-    if (buf)
-        PR_Free(buf);
-#endif
-
-    Assert(aResult != nsnull);
-
-    rv = FindFactory(aClass, getter_AddRefs(factory));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = factory->QueryInterface(aIID, aResult);
-
-    Log(("\t\tGetClassObject() %s", NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
+    nsresult rv = FindFactory(aClass, getter_AddRefs(factory));
+    if (NS_SUCCEEDED(rv))
+        rv = factory->QueryInterface(aIID, aResult);
+
+    Log(("nsComponentManager: GetClassObject(%RTuuid) returns %Rrv and %p\n", &aClass, rv, *aResult));
     return rv;
 }
@@ -1698 +1689 @@
                                                    void **aResult)
 {
-    nsresult rv;
+    LogFlow(("nsComponentManager: GetClassObjectByContractID(%s, %RTuuid)\n", contractID, &aIID));
+    Assert(aResult != nsnull);
 
     nsCOMPtr<nsIFactory> factory;
-
-    Log(("nsComponentManager: GetClassObject(%s)", contractID));
-    Assert(aResult != nsnull);
-
-    rv = FindFactory(contractID, strlen(contractID), getter_AddRefs(factory));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = factory->QueryInterface(aIID, aResult);
-
-    Log(("\t\tGetClassObject() %s", NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
+    nsresult rv = FindFactory(contractID, strlen(contractID), getter_AddRefs(factory));
+    if (NS_SUCCEEDED(rv))
+        rv = factory->QueryInterface(aIID, aResult);
+
+    Log(("nsComponentManager: GetClassObjectByContractID(%s, %RTuuid) returns %Rrv and %p\n", contractID, &aIID, rv, *aResult));
     return rv;
 }
@@ -1737 +1724 @@
         *aClass = fe->mCid;
         rv = NS_OK;
-    }
-#ifdef LOG_ENABLED
-    char *buf = 0;
-    if (NS_SUCCEEDED(rv))
-        buf = aClass->ToString();
-    Log(("nsComponentManager: ContractIDToClassID(%s)->%s", aContractID,
-         NS_SUCCEEDED(rv) ? buf : "[FAILED]"));
-    if (buf)
-        PR_Free(buf);
-#endif
+        Log(("nsComponentManager: ContractIDToClassID(%s)->%RTuuid\n", aContractID, aClass));
+    }
+    else
+        Log(("nsComponentManager: ContractIDToClassID(%s)->NS_ERROR_FACTORY_NOT_REGISTERED\n", aContractID));
     return rv;
 }
@@ -1764 +1745 @@
 {
     NS_WARNING("Need to implement CLSIDToContractID");
-
-    nsresult rv = NS_ERROR_FACTORY_NOT_REGISTERED;
-
-#ifdef LOG_ENABLED
-    char *buf = aClass.ToString();
-    Log(("nsComponentManager: CLSIDToContractID(%s)->%s", buf,
-         NS_SUCCEEDED(rv) ? *aContractID : "[FAILED]"));
-    if (buf)
-        PR_Free(buf);
-#endif
-    return rv;
+    Log(("nsComponentManager: CLSIDToContractID(%RTuuid)->NS_ERROR_FACTORY_NOT_REGISTERED\n", aClass));
+    RT_NOREF(aClass, aClassName, aContractID);
+    return NS_ERROR_FACTORY_NOT_REGISTERED;
 }
 
@@ -1810 +1783 @@
     mPendingCIDs.RemoveElement((void*)&aClass);
 }
+
 #endif
+
 /**
  * CreateInstance()
@@ -1840 +1815 @@
 
     if (aResult == nsnull)
-    {
         return NS_ERROR_NULL_POINTER;
-    }
+
     *aResult = nsnull;
 
     nsFactoryEntry *entry = GetFactoryEntry(aClass);
-
     if (!entry)
         return NS_ERROR_FACTORY_NOT_REGISTERED;
@@ -1863 +1836 @@
     nsIFactory *factory = nsnull;
     nsresult rv = entry->GetFactory(&factory, this);
-
     if (NS_SUCCEEDED(rv))
     {
@@ -1875 +1847 @@
     }
 
-#ifdef LOG_ENABLED
-    char *buf = aClass.ToString();
-    Log(("nsComponentManager: CreateInstance(%s) %s", buf,
-         NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
-    if (buf)
-        PR_Free(buf);
-#endif
-
+    Log(("nsComponentManager: CreateInstance(%RTuuid,,%RTuuid) %Rhrc & %p\n", &aClass, &aIID, rv, aResult));
     return rv;
 }
@@ -1954 +1919 @@
     }
 
-    Log(("nsComponentManager: CreateInstanceByContractID(%s) %s", aContractID,
-         NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
+    Log(("nsComponentManager: CreateInstanceByContractID(%s) %Rhrc and %p\n", aContractID, rv, *aResult));
     return rv;
 }
@@ -2586 +2550 @@
 {
     nsAutoMonitor mon(mMon);
-#ifdef LOG_ENABLED
-    char *buf = aClass.ToString();
-    Log(("nsComponentManager: RegisterFactory(%s, %s)", buf,
-         (aContractID ? aContractID : "(null)")));
-    if (buf)
-        PR_Free(buf);
-#endif
+    Log(("nsComponentManager: RegisterFactory(%RTuuid, %s)\n", &aClass, aContractID));
     nsFactoryEntry *entry = nsnull;
     nsFactoryTableEntry* factoryTableEntry = NS_STATIC_CAST(nsFactoryTableEntry*,
@@ -2598 +2556 @@
                                                                                  &aClass,
                                                                                  PL_DHASH_ADD));
-
     if (!factoryTableEntry)
         return NS_ERROR_OUT_OF_MEMORY;
 
 
-    if (PL_DHASH_ENTRY_IS_BUSY(factoryTableEntry)) {
+    if (PL_DHASH_ENTRY_IS_BUSY(factoryTableEntry))
         entry = factoryTableEntry->mFactoryEntry;
-    }
 
     if (entry && !aReplace)
     {
         // Already registered
-        Log(("\t\tFactory already registered."));
+        LogFunc(("Factory already registered.\n"));
         return NS_ERROR_FACTORY_EXISTS;
     }
@@ -2630 +2586 @@
         nsresult rv = HashContractID(aContractID, strlen(aContractID), entry);
         if (NS_FAILED(rv)) {
-            Log(("\t\tFactory register succeeded. "
-                 "Hashing contractid (%s) FAILED.", aContractID));
+            LogFunc(("Factory register succeeded. Hashing contractid (%s) FAILED.\n", aContractID));
             return rv;
         }
     }
 
-    Log(("\t\tFactory register succeeded contractid=%s.",
-          aContractID ? aContractID : "<none>"));
+    LogFunc(("Factory register succeeded contractid=%s.\n", aContractID));
     return NS_OK;
 }
@@ -2741 +2695 @@
     // Normalize proid and classname
     const char *contractID = (aContractID && *aContractID) ? aContractID : nsnull;
-#ifdef LOG_ENABLED
-    char *buf = aClass.ToString();
-    Log(("nsComponentManager: RegisterComponentCommon(%s, %s, %s, %s)",
-         buf, contractID ? contractID : "(null)",
-         aRegistryName, aType));
-    if (buf)
-        PR_Free(buf);
-#endif
+    Log(("nsComponentManager: RegisterComponentCommon(%RTuuid, %s, %s, %s)\n", &aClass, contractID, aRegistryName, aType));
     if (entry && !aReplace) {
-        Log(("\t\tFactory already registered."));
+        LogFunc(("Factory already registered.\n"));
         return NS_ERROR_FACTORY_EXISTS;
     }
@@ -2759 +2706 @@
     nsresult rv = GetLoaderForType(typeIndex, getter_AddRefs(loader));
     if (NS_FAILED(rv)) {
-        Log(("\t\tgetting loader for %s FAILED\n", aType));
+        LogFunc(("getting loader for %s FAILED\n", aType));
         return rv;
     }
@@ -2797 +2744 @@
         rv = HashContractID(contractID, aContractIDLen, entry);
         if (NS_FAILED(rv)) {
-            Log(("\t\tHashContractID(%s) FAILED\n", contractID));
+            LogFunc(("HashContractID(%s) FAILED\n", contractID));
             return rv;
         }
@@ -2948 +2895 @@
                                           nsIFactory *aFactory)
 {
-#ifdef LOG_ENABLED
-    char *buf = aClass.ToString();
-    Log(("nsComponentManager: UnregisterFactory(%s)", buf));
-    if (buf)
-        PR_Free(buf);
-#endif
+    Log(("nsComponentManager: UnregisterFactory(%RTuuid)\n", &aClass));
     nsFactoryEntry *old;
 
@@ -2970 +2912 @@
     }
 
-    Log(("\t\tUnregisterFactory() %s",
-         NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"));
+    LogFunc(("returns %Rhrc\n", rv));
     return rv;
 }
@@ -2979 +2920 @@
                                             const char *registryName)
 {
-#ifdef LOG_ENABLED
-    char *buf = aClass.ToString();
-    Log(("nsComponentManager: UnregisterComponent(%s)", buf));
-    if (buf)
-        PR_Free(buf);
-#endif
-
+    Log(("nsComponentManager: UnregisterComponent(%RTuuid)\n", &aClass));
     NS_ENSURE_ARG_POINTER(registryName);
     nsFactoryEntry *old;
@@ -3000 +2935 @@
     }
 
-    Log(("nsComponentManager: Factory unregister(%s) succeeded.", registryName));
+    Log(("nsComponentManager: Factory unregister(%s) succeeded.\n", registryName));
     return NS_OK;
 }
@@ -3029 +2964 @@
     nsAutoMonitor mon(mMon);
 
-    Log(("nsComponentManager: Unloading Libraries."));
+    Log(("nsComponentManager: Unloading Libraries.\n"));
 
     // UnloadAll the loaders
@@ -3505 +3440 @@
     nsresult rv = RegistryLocationForSpec(file, getter_Copies(registryName));
     if (NS_FAILED(rv))
+    {
+        Log(("nsComponentManagerImpl::HasFileChanged: failed rv=%#x\n", rv));
         return rv;
+    }
 
     nsCStringKey key(registryName);
@@ -3684 +3622 @@
         // xptiInterfaceInfoManager::BuildFileSearchPath, which it detects
         // as unsafe in debug builds. Just fail, no real problem.
-#ifdef DEBUG
+# ifdef DEBUG
         printf("NS_GetServiceManager: no current instance, suppressed XPCOM initialization!\n");
-#endif
+# endif
         rv = NS_ERROR_SERVICE_NOT_AVAILABLE;
 #else /* !VBOX */

trunk/src/libs/xpcom18a4/xpcom/components/nsNativeComponentLoader.cpp

@@ -131 +131 @@
     rv = GetFactoryFromModule(dll, aCID, _retval);
 
-    Log(("nsNativeComponentLoader: Factory creation %s for %s",
+    Log(("nsNativeComponentLoader: Factory creation %s for %s\n",
          (NS_SUCCEEDED(rv) ? "succeeded" : "FAILED"),
          aLocation));
@@ -428 +428 @@
 #endif
 
-    Log(("nsNativeComponentLoader: %s(%s) Load FAILED with error: %s",
+    Log(("nsNativeComponentLoader: %s(%s) Load FAILED with error: %s\n",
          aCallerName, displayPath.get(), errorMsg.get()));
     return NS_OK;
@@ -576 +576 @@
         || RTStrICmp(strLeafName.get() + cchLeafName - sizeof(s_szSuff) + 1, s_szSuff))
     {
-        Log(("Skipping '%s'...", strLeafName.get()));
+        Log(("Skipping '%s'...\n", strLeafName.get()));
         return NS_OK; /* skip */
     }
@@ -583 +583 @@
         && !RTStrICmp(strLeafName.get() + cchLeafName - sizeof(s_szSuffInvalid) + 1, s_szSuffInvalid))
     {
-        Log(("Skipping '%s' (#2)...", strLeafName.get()));
+        Log(("Skipping '%s' (#2)...\n", strLeafName.get()));
         return NS_OK; /* skip */
     }
 #endif
-    Log(("... '%s'", strLeafName.get()));
+    Log(("... '%s'\n", strLeafName.get()));
 
     nsXPIDLCString persistentDescriptor;
@@ -773 +773 @@
 nsNativeComponentLoader::UnloadAll(PRInt32 aWhen)
 {
-    Log(("nsNativeComponentLoader: Unloading...."));
+    Log(("nsNativeComponentLoader: Unloading....\n"));
 
     struct freeLibrariesClosure callData;

trunk/src/libs/xpcom18a4/xpcom/components/xcDll.cpp

@@ -66 +66 @@
 #include "nsNativeComponentLoader.h"
 #include "nsMemory.h"
+#include <VBox/log.h>
+
 
 nsDll::nsDll(nsIFile *dllSpec, nsNativeComponentLoader *loader)
@@ -116 +118 @@
     if (NS_FAILED(rv))
         return PR_TRUE;
+    Log2(("nsDll::HasChanged: currentDate=%RI64\n", currentDate));
     PRBool changed = PR_TRUE;
     manager->HasFileChanged(m_dllSpec, nsnull, currentDate, &changed);

trunk/src/libs/xpcom18a4/xpcom/threads/nsEventQueueService.cpp

@@ -299 +299 @@
     PLEventQueue *equeue;
     (*aNewQueue)->GetPLEventQueue(&equeue);
-    Log(("EventQueue: Service push queue [queue=%lx]",(long)equeue));
+    Log(("EventQueue: Service push queue [queue=%lx]\n",(long)equeue));
 #endif
 
@@ -333 +333 @@
     PLEventQueue *equeue;
     aQueue->GetPLEventQueue(&equeue);
-    Log(("EventQueue: Service pop queue [queue=%lx]",(long)equeue));
+    Log(("EventQueue: Service pop queue [queue=%lx]\n",(long)equeue));
 #endif
     aQueue->StopAcceptingEvents();

trunk/src/libs/xpcom18a4/xpcom/threads/plevent.c

@@ -379 +379 @@
     Assert(PR_GetMonitorEntryCount(queue->monitor) > 0);
     if (event->owner == owner) {
-        Log(("$$$ \tdestroying event %0x for owner %0x", event, owner));
+        Log(("$$$ \tdestroying event %0x for owner %0x\n", event, owner));
         PL_DequeueEvent(event, queue);
 
@@ -394 +394 @@
     }
     else {
-        Log(("$$$ \tskipping event %0x for owner %0x", event, owner));
+        Log(("$$$ \tskipping event %0x for owner %0x\n", event, owner));
     }
 }
@@ -404 +404 @@
         return;
 
-    Log(("$$$ revoking events for owner %0x", owner));
+    Log(("$$$ revoking events for owner %0x\n", owner));
 
     /*
@@ -411 +411 @@
     */
     PR_EnterMonitor(self->monitor);
-    Log(("$$$ owner %0x, entered monitor", owner));
+    Log(("$$$ owner %0x, entered monitor\n", owner));
 
     /*
@@ -430 +430 @@
     PR_ExitMonitor(self->monitor);
 
-    Log(("$$$ revoking events for owner %0x", owner));
+    Log(("$$$ revoking events for owner %0x\n", owner));
 }
 
@@ -480 +480 @@
             break;
 
-        Log(("$$$ processing event"));
+        Log(("$$$ processing event\n"));
         PL_HandleEvent(event);
-        Log(("$$$ done processing event"));
+        Log(("$$$ done processing event\n"));
     }
 
@@ -632 +632 @@
 
     while ((event = PL_GetEvent(self)) == NULL) {
-        Log(("$$$ waiting for event"));
+        Log(("$$$ waiting for event\n"));
         PR_Wait(mon, RT_INDEFINITE_WAIT);
     }
@@ -653 +653 @@
         }
 
-        Log(("$$$ processing event"));
+        Log(("$$$ processing event\n"));
         PL_HandleEvent(event);
-        Log(("$$$ done processing event"));
+        Log(("$$$ done processing event\n"));
     }
 }
@@ -745 +745 @@
 # endif
 
-    Log(("_pl_NativeNotify: self=%p", self));
+    Log(("_pl_NativeNotify: self=%p\n", self));
     count = write(self->eventPipe[1], buf, 1);
     if (count == 1)
@@ -772 +772 @@
     PRInt32 count;
     unsigned char c;
-    Log(("_pl_AcknowledgeNativeNotify: self=%p", self));
+    Log(("_pl_AcknowledgeNativeNotify: self=%p\n", self));
     /* consume the byte NativeNotify put in our pipe: */
     count = read(self->eventPipe[0], &c, 1);
@@ -910 +910 @@
         Log(("$$$ processing event %ld\n", event->id));
         if (event->id >= aID) {
-            Log(("$$$ skipping event and breaking"));
+            Log(("$$$ skipping event and breaking\n"));
             break;
         }
@@ -916 +916 @@
         event = PL_GetEvent(aSelf);
         PL_HandleEvent(event);
-        Log(("$$$ done processing event"));
+        Log(("$$$ done processing event\n"));
         count++;
     }