Changeset 101803 in vbox

Timestamp:

Nov 5, 2023 9:09:38 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Get rid of code used only if MOZ_TIMELINE is defined which we never do, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• python/src/loader/pyloader.cpp (modified) (5 diffs)
• xpcom/build/nsXPComInit.cpp (modified) (3 diffs)
• xpcom/components/xcDll.cpp (modified) (1 diff)
• xpcom/ds/nsITimelineService.idl (deleted)
• xpcom/ds/nsTimelineService.cpp (deleted)
• xpcom/ds/nsTimelineService.h (deleted)
• xpcom/io/nsLocalFileUnix.cpp (modified) (2 diffs)
• xpcom/io/nsLocalFileWin.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/Config.kmk

@@ -412 +412 @@
         xpcom/ds/nsISupportsIterators.idl \
         xpcom/ds/nsIVariant.idl \
-        xpcom/ds/nsITimelineService.idl \
         xpcom/ds/nsIArray.idl \
         xpcom/ds/nsIPropertyBag.idl \

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -645 +645 @@
         xpcom/ds/nsVariant.cpp \
         xpcom/ds/nsVoidArray.cpp \
-        xpcom/ds/nsTimelineService.cpp \
         xpcom/ds/nsValueArray.cpp \
         xpcom/ds/nsCOMArray.cpp \
@@ -1195 +1194 @@
                 nsISupportsArray.xpt \
                 nsISupportsIterators.xpt \
-                nsITimelineService.xpt \
                 nsIArray.xpt \
                 nsIObserverService.xpt \

trunk/src/libs/xpcom18a4/python/src/loader/pyloader.cpp

@@ -66 +66 @@
 
 #endif
-
-#include "nsITimelineService.h"
 
 typedef nsresult (*pfnPyXPCOM_NSGetModule)(nsIComponentManager *servMgr,
@@ -185 +183 @@
         PRBool bDidInitPython = !Py_IsInitialized(); // well, I will next line, anyway :-)
         if (bDidInitPython) {
-                NS_TIMELINE_START_TIMER("PyXPCOM: Python initializing");
                 Py_Initialize();
                 if (!Py_IsInitialized()) {
@@ -195 +192 @@
 #endif // NS_DEBUG
                 PyEval_InitThreads();
-                NS_TIMELINE_STOP_TIMER("PyXPCOM: Python initializing");
-                NS_TIMELINE_MARK_TIMER("PyXPCOM: Python initializing");
         }
         // Get the Python interpreter state
-        NS_TIMELINE_START_TIMER("PyXPCOM: Python threadstate setup");
 #ifndef PYXPCOM_USE_PYGILSTATE
         PyThreadState *threadStateCreated = NULL;
@@ -218 +212 @@
         PyGILState_STATE state = PyGILState_Ensure();
 #endif // PYXPCOM_USE_PYGILSTATE
-#ifdef MOZ_TIMELINE
-        // If the timeline service is installed, see if we can install our hooks.
-        if (NULL==PyImport_ImportModule("timeline_hook")) {
-                if (!PyErr_ExceptionMatches(PyExc_ImportError))
-                        LogError("Failed to import 'timeline_hook'");
-                PyErr_Clear(); // but don't care if we can't.
-        }
-#endif
         // Add the standard paths always - we may not have been the first to
         // init Python.
@@ -249 +235 @@
 #endif 
 
-        NS_TIMELINE_STOP_TIMER("PyXPCOM: Python threadstate setup");
-        NS_TIMELINE_MARK_TIMER("PyXPCOM: Python threadstate setup");
-        NS_TIMELINE_START_TIMER("PyXPCOM: PyXPCOM NSGetModule entry point");
         nsresult rc = PyXPCOM_NSGetModule(servMgr, location, result);
-        NS_TIMELINE_STOP_TIMER("PyXPCOM: PyXPCOM NSGetModule entry point");
-        NS_TIMELINE_MARK_TIMER("PyXPCOM: PyXPCOM NSGetModule entry point");
         return rc;
 }

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

@@ -106 +106 @@
 #include "nsAtomTable.h"
 #include "nsTraceRefcnt.h"
-#include "nsTimelineService.h"
 
 #include "nsVariant.h"
@@ -198 +197 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsRecyclingAllocatorImpl)
 
-#ifdef MOZ_TIMELINE
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimelineService)
-#endif
-
 static NS_METHOD
 nsXPTIInterfaceInfoManagerGetSingleton(nsISupports* outer,
@@ -369 +364 @@
     COMPONENT(EXCEPTIONSERVICE, nsExceptionServiceConstructor),
     COMPONENT(ATOMSERVICE, nsAtomServiceConstructor),
-#ifdef MOZ_TIMELINE
-    COMPONENT(TIMELINESERVICE, nsTimelineServiceConstructor),
-#endif
     COMPONENT(OBSERVERSERVICE, nsObserverService::Create),
     COMPONENT(GENERICFACTORY, nsGenericFactory::Create),

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

@@ -55 +55 @@
 #include "nsCRT.h"
 #include "nsString.h"
-#include "nsITimelineService.h"
 #include "nsModule.h"
 #ifdef DEBUG

trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.cpp

@@ -79 +79 @@
 #include "prproces.h"
 #include "nsISimpleEnumerator.h"
-#include "nsITimelineService.h"
 
 #include "nsNativeCharsetUtils.h"
@@ -1538 +1537 @@
     NS_ENSURE_ARG_POINTER(_retval);
 
-    NS_TIMELINE_START_TIMER("PR_LoadLibrary");
-
     *_retval = PR_LoadLibrary(mPath.get());
-
-    NS_TIMELINE_STOP_TIMER("PR_LoadLibrary");
-    NS_TIMELINE_MARK_TIMER1("PR_LoadLibrary", mPath.get());
 
     if (!*_retval)

trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileWin.cpp

@@ -68 +68 @@
 #include "nsXPIDLString.h"
 #include "prproces.h"
-#include "nsITimelineService.h"
 
 #include "nsAutoLock.h"
@@ -1339 +1338 @@
         return NS_ERROR_FILE_IS_DIRECTORY;
 
-    NS_TIMELINE_START_TIMER("PR_LoadLibrary");
     *_retval =  PR_LoadLibrary(mResolvedPath.get());
-    NS_TIMELINE_STOP_TIMER("PR_LoadLibrary");
-    NS_TIMELINE_MARK_TIMER1("PR_LoadLibrary", mResolvedPath.get());
-
     if (*_retval)
         return NS_OK;