Bug 1123956 - [e10s] Tweak timeout values for slow script UI (r=mrbkap)
authorBill McCloskey <wmccloskey@mozilla.com>
Tue, 20 Jan 2015 15:42:05 -0800 (2015-01-20)
changeset 224814 5002e9c06365c09ab2d32ae06f63047c38c8a960
parent 224772 c8b693e4b0de9477b0c33c9d852118de201ab48c
child 224815 092ee9f5e802c5ed4744181017373754507563c5
push id28146
push usercbook@mozilla.com
push dateWed, 21 Jan 2015 13:22:59 +0000 (2015-01-21)
treeherdermozilla-central@0f2b4a7a9daf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs1123956
milestone38.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 1123956 - [e10s] Tweak timeout values for slow script UI (r=mrbkap)
browser/modules/ProcessHangMonitor.jsm
modules/libpref/init/all.js
--- a/browser/modules/ProcessHangMonitor.jsm
+++ b/browser/modules/ProcessHangMonitor.jsm
@@ -15,20 +15,20 @@ Cu.import("resource://gre/modules/Servic
 
 /**
  * This JSM is responsible for observing content process hang reports
  * and asking the user what to do about them. See nsIHangReport for
  * the platform interface.
  */
 
 /**
- * If a hang hasn't been reported for more than 5 seconds, assume the
+ * If a hang hasn't been reported for more than 10 seconds, assume the
  * content process has gotten unstuck (and hide the hang notification).
  */
-const HANG_EXPIRATION_TIME = 5000;
+const HANG_EXPIRATION_TIME = 10000;
 
 let ProcessHangMonitor = {
   /**
    * Collection of hang reports that haven't expired or been dismissed
    * by the user. The keys are nsIHangReports and values keys are
    * timers. Each time the hang is reported, the timer is refreshed so
    * it expires after HANG_EXPIRATION_TIME.
    */
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2273,17 +2273,17 @@ pref("viewmanager.do_doublebuffering", t
 // enable single finger gesture input (win7+ tablets)
 pref("gestures.enable_single_finger_input", true);
 
 pref("editor.resizing.preserve_ratio",       true);
 pref("editor.positioning.offset",            0);
 
 pref("dom.use_watchdog", true);
 pref("dom.max_chrome_script_run_time", 20);
-pref("dom.max_child_script_run_time", 2);
+pref("dom.max_child_script_run_time", 10);
 pref("dom.max_script_run_time", 10);
 
 // If true, ArchiveReader will be enabled
 pref("dom.archivereader.enabled", false);
 
 // Hang monitor timeout after which we kill the browser, in seconds
 // (0 is disabled)
 // Disabled on all platforms per bug 705748 until the found issues are
@@ -2322,17 +2322,17 @@ pref("plugin.persistentPermissionAlways.
 // before we consider it "hung".
 pref("dom.ipc.plugins.timeoutSecs", 45);
 // How long a plugin process will wait for a response from the parent
 // to a synchronous request before terminating itself. After this
 // point the child assumes the parent is hung. Currently disabled.
 pref("dom.ipc.plugins.parentTimeoutSecs", 0);
 // How long a plugin in e10s is allowed to process a synchronous IPC
 // message before we notify the chrome process of a hang.
-pref("dom.ipc.plugins.contentTimeoutSecs", 2);
+pref("dom.ipc.plugins.contentTimeoutSecs", 45);
 // How long a plugin launch is allowed to take before
 // we consider it failed.
 pref("dom.ipc.plugins.processLaunchTimeoutSecs", 45);
 #ifdef XP_WIN
 // How long a plugin is allowed to process a synchronous IPC message
 // before we display the plugin hang UI
 pref("dom.ipc.plugins.hangUITimeoutSecs", 11);
 // Minimum time that the plugin hang UI will be displayed