diff options
Diffstat (limited to 'toolkit/xre')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 53 | ||||
| -rw-r--r-- | toolkit/xre/nsEmbedFunctions.cpp | 11 | ||||
| -rw-r--r-- | toolkit/xre/nsXREDirProvider.cpp | 2 |
3 files changed, 3 insertions, 63 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 4affd760c5..90e29f5517 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -19,7 +19,6 @@ #include "mozilla/ScopeExit.h" #include "mozilla/Services.h" #include "mozilla/ServoBindings.h" -#include "mozilla/Telemetry.h" #include "nsAppRunner.h" #include "mozilla/AppData.h" @@ -1574,8 +1573,6 @@ ProfileLockedDialog(nsIFile* aProfileDir, nsIFile* aProfileLocalDir, rv = xpcom.Initialize(); NS_ENSURE_SUCCESS(rv, rv); - mozilla::Telemetry::WriteFailedProfileLock(aProfileDir); - rv = xpcom.SetWindowCreator(aNative); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); @@ -3029,25 +3026,16 @@ namespace mozilla { } // namespace mozilla static void SetShutdownChecks() { - // Set default first. On debug builds we crash. On nightly and local - // builds we record. Nightlies will then send the info via telemetry, - // but it is usefull to have the data in about:telemetry in local builds - // too. + // Set default first. On debug builds we crash. #ifdef DEBUG gShutdownChecks = SCM_CRASH; #else - const char* releaseChannel = NS_STRINGIFY(MOZ_UPDATE_CHANNEL); - if (strcmp(releaseChannel, "nightly") == 0 || - strcmp(releaseChannel, "default") == 0) { - gShutdownChecks = SCM_RECORD; - } else { - gShutdownChecks = SCM_NOTHING; - } + gShutdownChecks = SCM_NOTHING; #endif // We let an environment variable override the default so that addons - // authors can use it for debugging shutdown with released firefox versions. + // authors can use it for debugging shutdown with released application versions. const char* mozShutdownChecksEnv = PR_GetEnv("MOZ_SHUTDOWN_CHECKS"); if (mozShutdownChecksEnv) { if (strcmp(mozShutdownChecksEnv, "crash") == 0) { @@ -3077,19 +3065,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag) SetShutdownChecks(); - // Enable Telemetry IO Reporting on DEBUG, nightly and local builds -#ifdef DEBUG - mozilla::Telemetry::InitIOReporting(gAppData->xreDirectory); -#else - { - const char* releaseChannel = NS_STRINGIFY(MOZ_UPDATE_CHANNEL); - if (strcmp(releaseChannel, "nightly") == 0 || - strcmp(releaseChannel, "default") == 0) { - mozilla::Telemetry::InitIOReporting(gAppData->xreDirectory); - } - } -#endif /* DEBUG */ - #if defined(MOZ_WIDGET_GTK) || defined(MOZ_ENABLE_XREMOTE) // Stash DESKTOP_STARTUP_ID in malloc'ed memory because gtk_init will clear it. #define HAVE_DESKTOP_STARTUP_ID @@ -3405,8 +3380,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag) //////////////////////// NOW WE HAVE A PROFILE //////////////////////// - mozilla::Telemetry::SetProfileDir(mProfD); - nsAutoCString version; BuildVersion(version); @@ -3800,15 +3773,6 @@ void XRE_GlibInit() } #endif -// Separate stub function to let us specifically suppress it in Valgrind -void -XRE_CreateStatsObject() -{ - // Initialize global variables used by histogram collection - // machinery that is used by by Telemetry. Note: is never de-initialised. - Telemetry::CreateStatisticsRecorder(); -} - /* * XRE_main - A class based main entry point used by most platforms. * Note that on OSX, aAppData->xreDirectory will point to @@ -3819,16 +3783,6 @@ XREMain::XRE_main(int argc, char* argv[], const nsXREAppData* aAppData) { ScopedLogging log; - // NB: this must happen after the creation of |ScopedLogging log| since - // ScopedLogging::ScopedLogging calls NS_LogInit, and - // XRE_CreateStatsObject calls Telemetry::CreateStatisticsRecorder, - // and NS_LogInit must be called before Telemetry::CreateStatisticsRecorder. - // NS_LogInit must be called before Telemetry::CreateStatisticsRecorder - // so as to avoid many log messages of the form - // WARNING: XPCOM objects created/destroyed from static ctor/dtor: [..] - // See bug 1279614. - XRE_CreateStatsObject(); - char aLocal; GeckoProfilerInitRAII profilerGuard(&aLocal); @@ -3977,7 +3931,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData, uint32_t aFlags) XREMain main; int result = main.XRE_main(argc, argv, aAppData); - mozilla::RecordShutdownEndTimeStamp(); return result; } diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp index dbcd678a83..841ea2a2d0 100644 --- a/toolkit/xre/nsEmbedFunctions.cpp +++ b/toolkit/xre/nsEmbedFunctions.cpp @@ -69,8 +69,6 @@ #include "GeckoProfiler.h" -#include "mozilla/Telemetry.h" - #ifdef MOZ_IPDL_TESTS #include "mozilla/_ipdltest/IPDLUnitTests.h" #include "mozilla/_ipdltest/IPDLUnitTestProcessChild.h" @@ -274,14 +272,6 @@ XRE_InitChildProcess(int aArgc, // NB: This must be called before profiler_init ScopedLogging logger; - // This is needed by Telemetry to initialize histogram collection. - // NB: This must be called after NS_LogInit(). - // NS_LogInit must be called before Telemetry::CreateStatisticsRecorder - // so as to avoid many log messages of the form - // WARNING: XPCOM objects created/destroyed from static ctor/dtor: [..] - // See bug 1279614. - Telemetry::CreateStatisticsRecorder(); - mozilla::LogModule::Init(); char aLocal; @@ -469,7 +459,6 @@ XRE_InitChildProcess(int aArgc, } } - Telemetry::DestroyStatisticsRecorder(); return XRE_DeinitCommandLine(); } diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index 1fb3cd815b..7997b53b16 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -41,7 +41,6 @@ #include "mozilla/Services.h" #include "mozilla/Omnijar.h" #include "mozilla/Preferences.h" -#include "mozilla/Telemetry.h" #include <stdlib.h> @@ -927,7 +926,6 @@ nsXREDirProvider::DoShutdown() // Phase 3: Notify observers of a profile change obsSvc->NotifyObservers(nullptr, "profile-before-change", kShutdownPersist); obsSvc->NotifyObservers(nullptr, "profile-before-change-qm", kShutdownPersist); - obsSvc->NotifyObservers(nullptr, "profile-before-change-telemetry", kShutdownPersist); } mProfileNotified = false; } |