Bug 1108587 - Extending the grace period of AsyncShutdown and the nsTerminator for ASAN builds;r=gsvelto
authorDavid Teller <dteller@mozilla.com>
Thu, 09 Nov 2017 16:21:34 +0100
changeset 444508 56e1ecb8bb58a8d26aa89367388ffa34911fe533
parent 444507 43c9ffb04eee6d40682156b15fdd6c5b09242a37
child 444509 ea98df19ce7be8130c5867b21254e7fec23c3ecb
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgsvelto
bugs1108587
milestone58.0a1
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
Bug 1108587 - Extending the grace period of AsyncShutdown and the nsTerminator for ASAN builds;r=gsvelto Bug 1108587 seems to suggest that the grace period for nsTerminator is too short for ASAN builds, which take much longer to shutdown. This patch changes the grace period from 1 minute to 3 minutes, hoping that this will be sufficient. Somewhere along the way, we also extend the duration of AsyncShutdown, because that's the simplest way to do both at once. MozReview-Commit-ID: 28eWO5m6Wh3
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1027,17 +1027,23 @@ pref("toolkit.telemetry.server_owner", "
 // Information page about telemetry (temporary ; will be about:telemetry in the end)
 pref("toolkit.telemetry.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#telemetry");
 // Determines whether full SQL strings are returned when they might contain sensitive info
 // i.e. dynamically constructed SQL strings or SQL executed by addons against addon DBs
 pref("toolkit.telemetry.debugSlowSql", false);
 // Whether to use the unified telemetry behavior, requires a restart.
 pref("toolkit.telemetry.unified", true);
 // AsyncShutdown delay before crashing in case of shutdown freeze
-pref("toolkit.asyncshutdown.crash_timeout", 60000);
+#ifndef MOZ_ASAN
+pref("toolkit.asyncshutdown.crash_timeout", 60000); // 1 minute
+#else
+// MOZ_ASAN builds can be considerably slower. Extending the grace period
+// of both asyncshutdown and the terminator.
+pref("toolkit.asyncshutdown.crash_timeout", 180000); // 3 minutes
+#endif // MOZ_ASAN
 // Extra logging for AsyncShutdown barriers and phases
 pref("toolkit.asyncshutdown.log", false);
 
 // Tells if DevTools have been explicitely enabled by the user.
 // This pref allows to disable all features related to DevTools
 // for users that never use them.
 // Until bug 1361080 lands, we always consider them enabled.
 pref("devtools.enabled", true);