Bug 1386760 - Remove the ExecutableName annotation r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D27885

--HG--
extra : moz-landing-system : lando

Author: gabrielesvelto

toolkit/crashreporter/CrashAnnotations.yaml

@@ -273,14 +273,6 @@ EventLoopNestingLevel:
   type: integer
   ping: true
 
-ExecutableName:
-  description: >
-    The name of the last executable that was launched via the nsIProcess class.
-    Multiple executables can be launched at the same time from one or more
-    threads so this annotation might not always contain the correct value. To
-    be removed once bug 1386760 is fixed.
-  type: string
-
 ExpectedStreamLen:
   description: >
     Expected length of an IPC proxy stream.

xpcom/threads/nsProcess.h

@@ -46,7 +46,6 @@ class nsProcess final : public nsIProcess, public nsIObserver {
  private:
   ~nsProcess();
   static void Monitor(void* aArg);
-  static void RemoveExecutableCrashAnnotation();
   void ProcessComplete();
   nsresult CopyArgsAndRunProcess(bool aBlocking, const char** aArgs,
                                  uint32_t aCount, nsIObserver* aObserver,
@@ -57,7 +56,6 @@ class nsProcess final : public nsIProcess, public nsIObserver {
   // The 'args' array is null-terminated.
   nsresult RunProcess(bool aBlocking, char** aArgs, nsIObserver* aObserver,
                       bool aHoldWeak, bool aArgsUTF8);
-  void AddExecutableCrashAnnotation();
 
   PRThread* mThread;
   mozilla::Mutex mLock;

xpcom/threads/nsProcessCommon.cpp

@@ -15,7 +15,6 @@
 #include "mozilla/ArrayUtils.h"
 
 #include "nsCOMPtr.h"
-#include "nsExceptionHandler.h"
 #include "nsAutoPtr.h"
 #include "nsMemory.h"
 #include "nsProcess.h"
@@ -246,7 +245,19 @@ void nsProcess::Monitor(void* aArg) {
       exitCode = -1;
     }
   }
-#elif defined(XP_UNIX)
+
+  // Lock in case Kill or GetExitCode are called during this
+  {
+    MutexAutoLock lock(process->mLock);
+    CloseHandle(process->mProcess);
+    process->mProcess = nullptr;
+    process->mExitValue = exitCode;
+    if (process->mShutdown) {
+      return;
+    }
+  }
+#else
+#  ifdef XP_UNIX
   int exitCode = -1;
   int status = 0;
   pid_t result;
@@ -260,30 +271,25 @@ void nsProcess::Monitor(void* aArg) {
       exitCode = 256;  // match NSPR's signal exit status
     }
   }
-#else
+#  else
   int32_t exitCode = -1;
   if (PR_WaitProcess(process->mProcess, &exitCode) != PR_SUCCESS) {
     exitCode = -1;
   }
-#endif
-
-  // The application has finished executing once we reach this point
-  RemoveExecutableCrashAnnotation();
+#  endif
 
   // Lock in case Kill or GetExitCode are called during this
   {
     MutexAutoLock lock(process->mLock);
-#if defined(PROCESSMODEL_WINAPI)
-    CloseHandle(process->mProcess);
-#endif
-#if !defined(XP_UNIX)
+#  if !defined(XP_UNIX)
     process->mProcess = nullptr;
-#endif
+#  endif
     process->mExitValue = exitCode;
     if (process->mShutdown) {
       return;
     }
   }
+#endif
 
   // If we ran a background thread for the monitor then notify on the main
   // thread
@@ -541,8 +547,6 @@ nsresult nsProcess::RunProcess(bool aBlocking, char** aMyArgv,
   mPid = ptrProc->pid;
 #endif
 
-  AddExecutableCrashAnnotation();
-
   NS_ADDREF_THIS();
   mBlocking = aBlocking;
   if (aBlocking) {
@@ -580,33 +584,6 @@ nsProcess::GetIsRunning(bool* aIsRunning) {
   return NS_OK;
 }
 
-void nsProcess::AddExecutableCrashAnnotation() {
-#if defined(XP_WIN)
-  nsAutoCString executableName;
-  if (NS_FAILED(mExecutable->GetNativeLeafName(executableName))) {
-    return;
-  }
-
-  // The following executables might be launched during shutdown and lead to a
-  // shutdown hang. We're adding this annotation to try and detect which is the
-  // culprit of bug 1386760
-  if (executableName.EqualsLiteral("minidump-analyzer.exe") ||
-      executableName.EqualsLiteral("pingsender.exe") ||
-      executableName.EqualsLiteral("updater.exe")) {
-    CrashReporter::AnnotateCrashReport(
-        CrashReporter::Annotation::ExecutableName, executableName.get());
-  }
-#endif  // defined(XP_WIN)
-}
-
-/* static */
-void nsProcess::RemoveExecutableCrashAnnotation() {
-#if defined(XP_WIN)
-  CrashReporter::RemoveCrashReportAnnotation(
-      CrashReporter::Annotation::ExecutableName);
-#endif  // defined(XP_WIN)
-}
-
 NS_IMETHODIMP
 nsProcess::GetStartHidden(bool* aStartHidden) {
   *aStartHidden = mStartHidden;