Backed out changeset 46179401c77b (bug 1529125) for talos xperf crashes on Windows
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 30 Apr 2019 19:22:42 +0200
changeset 530907 0f8f181540096810ec288bcb0954a798c05491ee
parent 530906 2daf0501d186ae0b7496aad0eb93519791bea0ea
child 530908 3de2f935e2d2658dda91deba799149ee29ce3837
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1529125
milestone68.0a1
backs out46179401c77b3f40291dea4cf636314399785c14
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 46179401c77b (bug 1529125) for talos xperf crashes on Windows
toolkit/xre/nsEmbedFunctions.cpp
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -83,17 +83,16 @@
 #if defined(XP_WIN)
 #  include "mozilla/WindowsConsole.h"
 #endif
 #include "mozilla/WindowsDllBlocklist.h"
 
 #include "GMPProcessChild.h"
 #include "mozilla/gfx/GPUProcessImpl.h"
 #include "mozilla/net/SocketProcessImpl.h"
-#include "mozilla/IOInterposer.h"
 
 #include "GeckoProfiler.h"
 
 #if defined(MOZ_SANDBOX) && defined(XP_WIN)
 #  include "mozilla/sandboxTarget.h"
 #  include "mozilla/sandboxing/loggingCallbacks.h"
 #  include "mozilla/RemoteSandboxBrokerProcessChild.h"
 #endif
@@ -360,22 +359,16 @@ nsresult XRE_InitChildProcess(int aArgc,
     nsCOMPtr<nsIFile> asanReporterPath = GetFileFromEnv("ASAN_REPORTER_PATH");
     if (!asanReporterPath) {
       MOZ_CRASH("Child did not receive ASAN_REPORTER_PATH!");
     }
     setASanReporterPath(asanReporterPath);
   }
 #endif
 
-  // Initialize the IOInterposer. This ensures that all threads that attempt to
-  // register themselves with the IOInterposer will be properly tracked. Note
-  // this initialization does not use the RAII guard IOInterposerInit, as it
-  // will fail to clear itself before the memory leak checks happen.
-  IOInterposer::Init();
-
 #if defined(XP_LINUX) && defined(MOZ_SANDBOX)
   // This has to happen before glib thread pools are started.
   mozilla::SandboxEarlyInit();
   // This just needs to happen before sandboxing, to initialize the
   // cached value, but libmozsandbox can't see this symbol.
   mozilla::GetNumberOfProcessors();
 #endif
 
@@ -758,20 +751,16 @@ nsresult XRE_InitChildProcess(int aArgc,
 
 #if defined(MOZ_SANDBOX)
       AddContentSandboxLevelAnnotation();
 #endif
 
       // Run the UI event loop on the main thread.
       uiMessageLoop.MessageLoop::Run();
 
-      // Clear the interposer instrumentation before the child process shuts
-      // down, so it doesn't show up as a leak.
-      IOInterposer::Clear();
-
       // Allow ProcessChild to clean up after itself before going out of
       // scope and being deleted
       process->CleanUp();
       mozilla::Omnijar::CleanUp();
 
 #if defined(XP_MACOSX)
       // Everybody should be done using shared memory by now.
       mozilla::ipc::SharedMemoryBasic::Shutdown();