Bug 1333296 (part 8) - Remove more SPS references. r=mstange.
authorNicholas Nethercote <nnethercote@mozilla.com>
Wed, 25 Jan 2017 12:55:50 +1100
changeset 331361 4d2b14111392bd1f1e2a11c9d002793b2e9f50d8
parent 331360 9a606c3f83b22face35bcd70b4536066ff75eb3b
child 331362 ffa53e63b8e5ac51bd62179f21b12f8a85c2863c
push id31266
push usercbook@mozilla.com
push dateFri, 27 Jan 2017 09:44:04 +0000
treeherdermozilla-central@8dbe89935366 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs1333296
milestone54.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 1333296 (part 8) - Remove more SPS references. r=mstange.
testing/talos/talos/pageloader/chrome/Profiler.js
testing/talos/talos/scripts/Profiler.js
testing/talos/talos/startup_test/tresize/addon/content/Profiler.js
testing/talos/talos/talos-powers/content/TalosContentProfiler.js
testing/talos/talos/talos-powers/content/TalosParentProfiler.js
testing/talos/talos/tests/devtools/addon/content/Profiler.js
testing/talos/talos/tests/tart/addon/content/Profiler.js
--- a/testing/talos/talos/pageloader/chrome/Profiler.js
+++ b/testing/talos/talos/pageloader/chrome/Profiler.js
@@ -61,31 +61,31 @@ var Profiler;
 
     return result;
   }
 
   Profiler = {
     /**
      * Initialize the profiler using profiler settings supplied in a JS object.
      * The following properties on the object are respected:
-     *  - sps_profile_interval
-     *  - sps_profile_entries
-     *  - sps_profile_threads
-     *  - sps_profile_dir
+     *  - gecko_profile_interval
+     *  - gecko_profile_entries
+     *  - gecko_profile_threads
+     *  - gecko_profile_dir
      */
     initFromObject: function Profiler__initFromObject (obj) {
       if (obj &&
-          ("sps_profile_dir" in obj) && typeof obj.sps_profile_dir == "string" &&
-          ("sps_profile_interval" in obj) && Number.isFinite(obj.sps_profile_interval * 1) &&
-          ("sps_profile_entries" in obj) && Number.isFinite(obj.sps_profile_entries * 1) &&
-          ("sps_profile_threads" in obj) && typeof obj.sps_profile_threads == "string") {
-        profiler_interval = obj.sps_profile_interval;
-        profiler_entries = obj.sps_profile_entries;
-        profiler_threadsArray = obj.sps_profile_threads.split(",");
-        profiler_dir = obj.sps_profile_dir;
+          ("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+          ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+          ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+          ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+        profiler_interval = obj.gecko_profile_interval;
+        profiler_entries = obj.gecko_profile_entries;
+        profiler_threadsArray = obj.gecko_profile_threads.split(",");
+        profiler_dir = obj.gecko_profile_dir;
         enabled = true;
       }
     },
     initFromURLQueryParams: function Profiler__initFromURLQueryParams (locationSearch) {
       this.initFromObject(searchToObject(locationSearch));
     },
     beginTest: function Profiler__beginTest (testName) {
       currentTest = testName;
--- a/testing/talos/talos/scripts/Profiler.js
+++ b/testing/talos/talos/scripts/Profiler.js
@@ -61,31 +61,31 @@ var Profiler;
 
     return result;
   }
 
   Profiler = {
     /**
      * Initialize the profiler using profiler settings supplied in a JS object.
      * The following properties on the object are respected:
-     *  - sps_profile_interval
-     *  - sps_profile_entries
-     *  - sps_profile_threads
-     *  - sps_profile_dir
+     *  - gecko_profile_interval
+     *  - gecko_profile_entries
+     *  - gecko_profile_threads
+     *  - gecko_profile_dir
      */
     initFromObject: function Profiler__initFromObject (obj) {
       if (obj &&
-          ("sps_profile_dir" in obj) && typeof obj.sps_profile_dir == "string" &&
-          ("sps_profile_interval" in obj) && Number.isFinite(obj.sps_profile_interval * 1) &&
-          ("sps_profile_entries" in obj) && Number.isFinite(obj.sps_profile_entries * 1) &&
-          ("sps_profile_threads" in obj) && typeof obj.sps_profile_threads == "string") {
-        profiler_interval = obj.sps_profile_interval;
-        profiler_entries = obj.sps_profile_entries;
-        profiler_threadsArray = obj.sps_profile_threads.split(",");
-        profiler_dir = obj.sps_profile_dir;
+          ("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+          ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+          ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+          ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+        profiler_interval = obj.gecko_profile_interval;
+        profiler_entries = obj.gecko_profile_entries;
+        profiler_threadsArray = obj.gecko_profile_threads.split(",");
+        profiler_dir = obj.gecko_profile_dir;
         enabled = true;
       }
     },
     initFromURLQueryParams: function Profiler__initFromURLQueryParams (locationSearch) {
       this.initFromObject(searchToObject(locationSearch));
     },
     beginTest: function Profiler__beginTest (testName) {
       currentTest = testName;
--- a/testing/talos/talos/startup_test/tresize/addon/content/Profiler.js
+++ b/testing/talos/talos/startup_test/tresize/addon/content/Profiler.js
@@ -61,31 +61,31 @@ var Profiler;
 
     return result;
   }
 
   Profiler = {
     /**
      * Initialize the profiler using profiler settings supplied in a JS object.
      * The following properties on the object are respected:
-     *  - sps_profile_interval
-     *  - sps_profile_entries
-     *  - sps_profile_threads
-     *  - sps_profile_dir
+     *  - gecko_profile_interval
+     *  - gecko_profile_entries
+     *  - gecko_profile_threads
+     *  - gecko_profile_dir
      */
     initFromObject: function Profiler__initFromObject (obj) {
       if (obj &&
-          ("sps_profile_dir" in obj) && typeof obj.sps_profile_dir == "string" &&
-          ("sps_profile_interval" in obj) && Number.isFinite(obj.sps_profile_interval * 1) &&
-          ("sps_profile_entries" in obj) && Number.isFinite(obj.sps_profile_entries * 1) &&
-          ("sps_profile_threads" in obj) && typeof obj.sps_profile_threads == "string") {
-        profiler_interval = obj.sps_profile_interval;
-        profiler_entries = obj.sps_profile_entries;
-        profiler_threadsArray = obj.sps_profile_threads.split(",");
-        profiler_dir = obj.sps_profile_dir;
+          ("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+          ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+          ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+          ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+        profiler_interval = obj.gecko_profile_interval;
+        profiler_entries = obj.gecko_profile_entries;
+        profiler_threadsArray = obj.gecko_profile_threads.split(",");
+        profiler_dir = obj.gecko_profile_dir;
         enabled = true;
       }
     },
     initFromURLQueryParams: function Profiler__initFromURLQueryParams (locationSearch) {
       this.initFromObject(searchToObject(locationSearch));
     },
     beginTest: function Profiler__beginTest (testName) {
       currentTest = testName;
--- a/testing/talos/talos/talos-powers/content/TalosContentProfiler.js
+++ b/testing/talos/talos/talos-powers/content/TalosContentProfiler.js
@@ -97,31 +97,31 @@ var TalosContentProfiler;
   }
 
   TalosContentProfiler = {
     /**
      * Initialize the profiler using profiler settings supplied in a JS object.
      *
      * @param obj (object)
      *   The following properties on the object are respected:
-     *     sps_profile_interval (int)
-     *     sps_profile_entries (int)
-     *     sps_profile_threads (string, comma separated list of threads to filter with)
-     *     sps_profile_dir (string)
+     *     gecko_profile_interval (int)
+     *     gecko_profile_entries (int)
+     *     gecko_profile_threads (string, comma separated list of threads to filter with)
+     *     gecko_profile_dir (string)
      */
     initFromObject(obj={}) {
       if (!initted) {
-        if (("sps_profile_dir" in obj) && typeof obj.sps_profile_dir == "string" &&
-            ("sps_profile_interval" in obj) && Number.isFinite(obj.sps_profile_interval * 1) &&
-            ("sps_profile_entries" in obj) && Number.isFinite(obj.sps_profile_entries * 1) &&
-            ("sps_profile_threads" in obj) && typeof obj.sps_profile_threads == "string") {
-          interval = obj.sps_profile_interval;
-          entries = obj.sps_profile_entries;
-          threadsArray = obj.sps_profile_threads.split(",");
-          profileDir = obj.sps_profile_dir;
+        if (("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+            ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+            ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+            ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+          interval = obj.gecko_profile_interval;
+          entries = obj.gecko_profile_entries;
+          threadsArray = obj.gecko_profile_threads.split(",");
+          profileDir = obj.gecko_profile_dir;
           initted = true;
         } else {
           console.error("Profiler could not init with object: " + JSON.stringify(obj));
         }
       }
     },
 
     /**
--- a/testing/talos/talos/talos-powers/content/TalosParentProfiler.js
+++ b/testing/talos/talos/talos-powers/content/TalosParentProfiler.js
@@ -64,31 +64,31 @@ var TalosParentProfiler;
   }
 
   TalosParentProfiler = {
     /**
      * Initialize the profiler using profiler settings supplied in a JS object.
      *
      * @param obj (object)
      *   The following properties on the object are respected:
-     *     sps_profile_interval (int)
-     *     sps_profile_entries (int)
-     *     sps_profile_threads (string, comma separated list of threads to filter with)
-     *     sps_profile_dir (string)
+     *     gecko_profile_interval (int)
+     *     gecko_profile_entries (int)
+     *     gecko_profile_threads (string, comma separated list of threads to filter with)
+     *     gecko_profile_dir (string)
      */
     initFromObject(obj={}) {
       if (!initted) {
-        if (("sps_profile_dir" in obj) && typeof obj.sps_profile_dir == "string" &&
-            ("sps_profile_interval" in obj) && Number.isFinite(obj.sps_profile_interval * 1) &&
-            ("sps_profile_entries" in obj) && Number.isFinite(obj.sps_profile_entries * 1) &&
-            ("sps_profile_threads" in obj) && typeof obj.sps_profile_threads == "string") {
-          interval = obj.sps_profile_interval;
-          entries = obj.sps_profile_entries;
-          threadsArray = obj.sps_profile_threads.split(",");
-          profileDir = obj.sps_profile_dir;
+        if (("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+            ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+            ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+            ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+          interval = obj.gecko_profile_interval;
+          entries = obj.gecko_profile_entries;
+          threadsArray = obj.gecko_profile_threads.split(",");
+          profileDir = obj.gecko_profile_dir;
           initted = true;
         } else {
           console.error("Profiler could not init with object: " + JSON.stringify(obj));
         }
       }
     },
 
     /**
--- a/testing/talos/talos/tests/devtools/addon/content/Profiler.js
+++ b/testing/talos/talos/tests/devtools/addon/content/Profiler.js
@@ -61,31 +61,31 @@ var Profiler;
 
     return result;
   }
 
   Profiler = {
     /**
      * Initialize the profiler using profiler settings supplied in a JS object.
      * The following properties on the object are respected:
-     *  - sps_profile_interval
-     *  - sps_profile_entries
-     *  - sps_profile_threads
-     *  - sps_profile_dir
+     *  - gecko_profile_interval
+     *  - gecko_profile_entries
+     *  - gecko_profile_threads
+     *  - gecko_profile_dir
      */
     initFromObject: function Profiler__initFromObject (obj) {
       if (obj &&
-          ("sps_profile_dir" in obj) && typeof obj.sps_profile_dir == "string" &&
-          ("sps_profile_interval" in obj) && Number.isFinite(obj.sps_profile_interval * 1) &&
-          ("sps_profile_entries" in obj) && Number.isFinite(obj.sps_profile_entries * 1) &&
-          ("sps_profile_threads" in obj) && typeof obj.sps_profile_threads == "string") {
-        profiler_interval = obj.sps_profile_interval;
-        profiler_entries = obj.sps_profile_entries;
-        profiler_threadsArray = obj.sps_profile_threads.split(",");
-        profiler_dir = obj.sps_profile_dir;
+          ("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+          ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+          ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+          ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+        profiler_interval = obj.gecko_profile_interval;
+        profiler_entries = obj.gecko_profile_entries;
+        profiler_threadsArray = obj.gecko_profile_threads.split(",");
+        profiler_dir = obj.gecko_profile_dir;
         enabled = true;
       }
     },
     initFromURLQueryParams: function Profiler__initFromURLQueryParams (locationSearch) {
       this.initFromObject(searchToObject(locationSearch));
     },
     beginTest: function Profiler__beginTest (testName) {
       currentTest = testName;
--- a/testing/talos/talos/tests/tart/addon/content/Profiler.js
+++ b/testing/talos/talos/tests/tart/addon/content/Profiler.js
@@ -61,31 +61,31 @@ var Profiler;
 
     return result;
   }
 
   Profiler = {
     /**
      * Initialize the profiler using profiler settings supplied in a JS object.
      * The following properties on the object are respected:
-     *  - sps_profile_interval
-     *  - sps_profile_entries
-     *  - sps_profile_threads
-     *  - sps_profile_dir
+     *  - gecko_profile_interval
+     *  - gecko_profile_entries
+     *  - gecko_profile_threads
+     *  - gecko_profile_dir
      */
     initFromObject: function Profiler__initFromObject (obj) {
       if (obj &&
-          ("sps_profile_dir" in obj) && typeof obj.sps_profile_dir == "string" &&
-          ("sps_profile_interval" in obj) && Number.isFinite(obj.sps_profile_interval * 1) &&
-          ("sps_profile_entries" in obj) && Number.isFinite(obj.sps_profile_entries * 1) &&
-          ("sps_profile_threads" in obj) && typeof obj.sps_profile_threads == "string") {
-        profiler_interval = obj.sps_profile_interval;
-        profiler_entries = obj.sps_profile_entries;
-        profiler_threadsArray = obj.sps_profile_threads.split(",");
-        profiler_dir = obj.sps_profile_dir;
+          ("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+          ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+          ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+          ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+        profiler_interval = obj.gecko_profile_interval;
+        profiler_entries = obj.gecko_profile_entries;
+        profiler_threadsArray = obj.gecko_profile_threads.split(",");
+        profiler_dir = obj.gecko_profile_dir;
         enabled = true;
       }
     },
     initFromURLQueryParams: function Profiler__initFromURLQueryParams (locationSearch) {
       this.initFromObject(searchToObject(locationSearch));
     },
     beginTest: function Profiler__beginTest (testName) {
       currentTest = testName;