Backed out 5 changesets (bug 1401400) for eslint failure

Backed out changeset 788f5831a14d (bug 1401400)
Backed out changeset 3ccd39a02c21 (bug 1401400)
Backed out changeset e5860d5128fb (bug 1401400)
Backed out changeset fa28abe68df1 (bug 1401400)
Backed out changeset 0290bb0af376 (bug 1401400)

MozReview-Commit-ID: 8e9kQEaE7Bs

toolkit/components/crashes/CrashService.js

@@ -25,13 +25,11 @@ var gRunningProcesses = new Set();
  * stack traces will be stored in the .extra file under the StackTraces= entry.
  *
  * @param minidumpPath {string} The path to the minidump file
- * @param allThreads {bool} Gather stack traces for all threads, not just the
- *                   crashing thread.
  *
  * @returns {Promise} A promise that gets resolved once minidump analysis has
  *          finished.
  */
-function runMinidumpAnalyzer(minidumpPath, allThreads) {
+function runMinidumpAnalyzer(minidumpPath) {
   return new Promise((resolve, reject) => {
     try {
       const binSuffix = AppConstants.platform === "win" ? ".exe" : "";
@@ -54,10 +52,6 @@ function runMinidumpAnalyzer(minidumpPath, allThreads) {
       process.startHidden = true;
       process.noShell = true;
 
-      if (allThreads) {
-        args.unshift("--full");
-      }
-
       process.runAsync(args, args.length, (subject, topic, data) => {
         switch (topic) {
           case "process-finished":
@@ -179,15 +173,12 @@ CrashService.prototype = Object.freeze({
       throw new Error("Unrecognized PROCESS_TYPE: " + processType);
     }
 
-    let allThreads = false;
-
     switch (crashType) {
     case Ci.nsICrashService.CRASH_TYPE_CRASH:
       crashType = Services.crashmanager.CRASH_TYPE_CRASH;
       break;
     case Ci.nsICrashService.CRASH_TYPE_HANG:
       crashType = Services.crashmanager.CRASH_TYPE_HANG;
-      allThreads = true;
       break;
     default:
       throw new Error("Unrecognized CRASH_TYPE: " + crashType);
@@ -203,7 +194,7 @@ CrashService.prototype = Object.freeze({
     if (!gQuitting) {
       // Minidump analysis can take a long time, don't start it if the browser
       // is already quitting.
-      await runMinidumpAnalyzer(minidumpPath, allThreads);
+      await runMinidumpAnalyzer(minidumpPath);
     }
 
     metadata = await processExtraFile(extraPath);

toolkit/components/crashes/tests/xpcshell/test_crash_service.js

@@ -60,22 +60,19 @@ async function teardown() {
   await OS.File.remove(gExtraFile);
 }
 
-async function test_addCrashBase(crashId, allThreads) {
+add_task(async function test_addCrash() {
+  const crashId = "56cd87bc-bb26-339b-3a8e-f00c0f11380e";
   await setup(crashId);
 
-  let crashType = Ci.nsICrashService.CRASH_TYPE_CRASH;
-  if (allThreads) {
-    crashType = Ci.nsICrashService.CRASH_TYPE_HANG;
-  }
   let cs = Cc["@mozilla.org/crashservice;1"].getService(Ci.nsICrashService);
-  await cs.addCrash(Ci.nsICrashService.PROCESS_TYPE_CONTENT, crashType,
-    crashId);
+  await cs.addCrash(Ci.nsICrashService.PROCESS_TYPE_CONTENT,
+                    Ci.nsICrashService.CRASH_TYPE_CRASH, crashId);
   let crashes = await Services.crashmanager.getCrashes();
   let crash = crashes.find(c => { return c.id === crashId; });
   Assert.ok(crash, "Crash " + crashId + " has been stored successfully.");
   Assert.equal(crash.metadata.ProcessType, "content");
   Assert.equal(crash.metadata.MinidumpSha256Hash,
-    "c8ad56a2096310f40c8a4b46c890625a740fdd72e409f412933011ff947c5a40");
+    "24b0ea7794b2d2523c46c9aea72c03ccbb0ab88ad76d8258d3752c7b71d233ff");
   Assert.ok(crash.metadata.StackTraces, "The StackTraces field is present.\n");
 
   try {
@@ -84,17 +81,9 @@ async function test_addCrashBase(crashId, allThreads) {
     Assert.ok(stackTraces.crash_info, "The crash_info field is populated.");
     Assert.ok(stackTraces.modules && (stackTraces.modules.length > 0),
               "The module list is populated.");
-    Assert.ok(stackTraces.threads && (stackTraces.threads.length > 0),
+    Assert.ok(stackTraces.threads && (stackTraces.modules.length > 0),
               "The thread list is populated.");
 
-    if (allThreads) {
-      Assert.ok(stackTraces.threads.length > 1,
-        "The stack trace contains more than one thread.");
-    } else {
-      Assert.ok(stackTraces.threads.length == 1,
-        "The stack trace contains exactly one thread.");
-    }
-
     let frames = stackTraces.threads[0].frames;
     Assert.ok(frames && (frames.length > 0), "The stack trace is present.\n");
   } catch (e) {
@@ -110,14 +99,6 @@ async function test_addCrashBase(crashId, allThreads) {
   }
 
   await teardown();
-};
-
-add_task(async function test_addCrash() {
-  await test_addCrashBase("56cd87bc-bb26-339b-3a8e-f00c0f11380e", false);
-});
-
-add_task(async function test_addCrashAllThreads() {
-  await test_addCrashBase("071843c4-da89-4447-af9f-965163e0b253", true);
 });
 
 add_task(async function test_addCrash_quitting() {

toolkit/components/terminator/nsTerminator.cpp

@@ -157,9 +157,6 @@ RunWatchdog(void* arg)
     }
 
     // Shutdown is apparently dead. Crash the process.
-#if defined(MOZ_CRASHREPORTER)
-    CrashReporter::SetMinidumpAnalysisAllThreads();
-#endif
     MOZ_CRASH("Shutdown too long, probably frozen, causing a crash.");
   }
 }

toolkit/crashreporter/client/crashreporter.cpp

@@ -642,8 +642,6 @@ GetProgramPath(const string& exename)
 
 int main(int argc, char** argv)
 {
-  bool minidumpAllThreads = false;
-
   gArgc = argc;
   gArgv = argv;
 
@@ -655,12 +653,7 @@ int main(int argc, char** argv)
   if (!UIInit())
     return 0;
 
-  if (argc == 3) {
-    if (!strcmp(argv[1], "--full")) {
-      minidumpAllThreads = true;
-    }
-    gReporterDumpFile = argv[2];
-  } else if (argc == 2) {
+  if (argc > 1) {
     gReporterDumpFile = argv[1];
   }
 
@@ -671,9 +664,6 @@ int main(int argc, char** argv)
     // Start by running minidump analyzer to gather stack traces.
     string reporterDumpFile = gReporterDumpFile;
     vector<string> args = { reporterDumpFile };
-    if (minidumpAllThreads) {
-      args.insert(args.begin(), "--full");
-    }
     UIRunProgram(GetProgramPath(UI_MINIDUMP_ANALYZER_FILENAME),
                  args, /* wait */ true);
 

toolkit/crashreporter/nsExceptionHandler.cpp

@@ -247,7 +247,6 @@ static nsCString* crashEventAPIData = nullptr;
 static nsCString* notesField = nullptr;
 static bool isGarbageCollecting;
 static uint32_t eventloopNestingLevel = 0;
-static bool minidumpAnalysisAllThreads = false;
 
 // Avoid a race during application termination.
 static Mutex* dumpSafetyLock;
@@ -819,8 +818,7 @@ WriteGlobalMemoryStatus(PlatformWriter* apiData, PlatformWriter* eventFile)
  *        to the launched program
  */
 static bool
-LaunchProgram(const XP_CHAR* aProgramPath, const XP_CHAR* aMinidumpPath,
-              bool aAllThreads)
+LaunchProgram(const XP_CHAR* aProgramPath, const XP_CHAR* aMinidumpPath)
 {
 #ifdef XP_WIN
   XP_CHAR cmdLine[CMDLINE_SIZE];
@@ -829,11 +827,7 @@ LaunchProgram(const XP_CHAR* aProgramPath, const XP_CHAR* aMinidumpPath,
   size_t size = CMDLINE_SIZE;
   p = Concat(cmdLine, L"\"", &size);
   p = Concat(p, aProgramPath, &size);
-  p = Concat(p, L"\" ", &size);
-  if (aAllThreads) {
-    p = Concat(p, L"--full ", &size);
-  }
-  p = Concat(p, L"\"", &size);
+  p = Concat(p, L"\" \"", &size);
   p = Concat(p, aMinidumpPath, &size);
   Concat(p, L"\"", &size);
 
@@ -853,20 +847,12 @@ LaunchProgram(const XP_CHAR* aProgramPath, const XP_CHAR* aMinidumpPath,
   setenv("DYLD_LIBRARY_PATH", libraryPath, /* overwrite */ 1);
 
   pid_t pid = 0;
-  char* my_argv[] = {
+  char* const my_argv[] = {
     const_cast<char*>(aProgramPath),
     const_cast<char*>(aMinidumpPath),
-    nullptr,
     nullptr
   };
 
-  char fullArg[] = "--full";
-
-  if (aAllThreads) {
-    my_argv[2] = my_argv[1];
-    my_argv[1] = fullArg;
-  }
-
   char **env = nullptr;
   char ***nsEnv = _NSGetEnviron();
   if (nsEnv) {
@@ -887,14 +873,8 @@ LaunchProgram(const XP_CHAR* aProgramPath, const XP_CHAR* aMinidumpPath,
     // need to clobber this, as libcurl might load NSS,
     // and we want it to load the system NSS.
     unsetenv("LD_LIBRARY_PATH");
-
-    if (aAllThreads) {
-      Unused << execl(aProgramPath,
-                      aProgramPath, "--full", aMinidumpPath, (char*)0);
-    } else {
-      Unused << execl(aProgramPath,
-                      aProgramPath, aMinidumpPath, (char*)0);
-    }
+    Unused << execl(aProgramPath,
+                    aProgramPath, aMinidumpPath, (char*)0);
     _exit(1);
   }
 #endif // XP_MACOSX
@@ -1244,8 +1224,7 @@ bool MinidumpCallback(
   returnValue = LaunchCrashReporterActivity(crashReporterPath, minidumpPath,
                                             succeeded);
 #else // Windows, Mac, Linux, etc...
-  returnValue = LaunchProgram(crashReporterPath, minidumpPath,
-                              minidumpAnalysisAllThreads);
+  returnValue = LaunchProgram(crashReporterPath, minidumpPath);
 #ifdef XP_WIN
   TerminateProcess(GetCurrentProcess(), 1);
 #endif
@@ -2394,11 +2373,6 @@ void SetEventloopNestingLevel(uint32_t level)
   eventloopNestingLevel = level;
 }
 
-void SetMinidumpAnalysisAllThreads()
-{
-  minidumpAnalysisAllThreads = true;
-}
-
 nsresult AppendAppNotesToCrashReport(const nsACString& data)
 {
   if (!GetEnabled())

toolkit/crashreporter/nsExceptionHandler.h

@@ -84,7 +84,6 @@ void AnnotatePendingIPC(size_t aNumOfPendingIPC,
                         uint32_t aTopPendingIPCType);
 nsresult SetGarbageCollecting(bool collecting);
 void SetEventloopNestingLevel(uint32_t level);
-void SetMinidumpAnalysisAllThreads();
 
 nsresult SetRestartArgs(int argc, char** argv);
 nsresult SetupExtraData(nsIFile* aAppDataDirectory,

xpcom/threads/HangMonitor.cpp

@@ -116,7 +116,6 @@ Crash()
   if (GeckoProcessType_Default == XRE_GetProcessType()) {
     CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Hang"),
                                        NS_LITERAL_CSTRING("1"));
-    CrashReporter::SetMinidumpAnalysisAllThreads();
   }
 #endif