Bug 1544686 - [raptor] Fix Gecko profiler settings. r=rwood
authorHenrik Skupin <mail@hskupin.info>
Tue, 23 Apr 2019 15:37:29 +0000
changeset 530612 9ff6837b1526aaae3eca6546245ace6710c20a40
parent 530611 411778eb8dafcfb32ac417f7da88d66dbcd3e03c
child 530613 201fb70499ef00904a0a728f5934b1ea66bddd7b
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)
reviewersrwood
bugs1544686
milestone68.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 1544686 - [raptor] Fix Gecko profiler settings. r=rwood When the Gecko profiler is enabled the interval and entries as specified in manifest files aren't correctly set. Instead the default values from the extension are always used. Also with WebRender enabled the threads are "WR", and "Renderer", but not "WR,Renderer". Differential Revision: https://phabricator.services.mozilla.com/D28045
testing/raptor/webext/raptor/runner.js
--- a/testing/raptor/webext/raptor/runner.js
+++ b/testing/raptor/webext/raptor/runner.js
@@ -115,21 +115,21 @@ function getTestSettings() {
         results.lower_is_better = settings.lower_is_better === true;
         results.subtest_lower_is_better = settings.subtest_lower_is_better === true;
         results.alert_threshold = settings.alert_threshold;
 
         if (settings.gecko_profile !== undefined) {
           if (settings.gecko_profile === true) {
             geckoProfiling = true;
             results.extra_options = ["gecko_profile"];
-            if (settings.gecko_interval !== undefined) {
-              geckoInterval = settings.gecko_interval;
+            if (settings.gecko_profile_interval !== undefined) {
+              geckoInterval = settings.gecko_profile_interval;
             }
-            if (settings.gecko_entries !== undefined) {
-              geckoEntries = settings.gecko_entries;
+            if (settings.gecko_profile_entries !== undefined) {
+              geckoEntries = settings.gecko_profile_entries;
             }
             if (settings.webrender_enabled !== undefined) {
               webRenderEnabled = settings.webrender_enabled;
             }
           }
         }
 
         if (settings.screen_capture !== undefined) {
@@ -317,17 +317,17 @@ function onError(error) {
   console.log("Screenshot captured failed!");
   console.log(`Error: ${error}`);
 }
 
 
 async function startGeckoProfiling() {
   var _threads;
   if (webRenderEnabled) {
-    _threads = ["GeckoMain", "Compositor", "WR,Renderer"];
+    _threads = ["GeckoMain", "Compositor", "WR", "Renderer"];
   } else {
     _threads = ["GeckoMain", "Compositor"];
   }
   postToControlServer("status", "starting gecko profiling");
   await browser.geckoProfiler.start({
     bufferSize: geckoEntries,
     interval: geckoInterval,
     features: ["js", "leaf", "stackwalk", "threads", "responsiveness"],