Bug 1196047 - Move most of shared/performance to client or server. r=jsantell

--HG--
rename : devtools/shared/performance/legacy/compatibility.js => devtools/client/performance/legacy/compatibility.js
rename : devtools/shared/performance/utils.js => devtools/shared/performance/recording-utils.js

devtools/client/performance/legacy/actors.js

@@ -12,9 +12,9 @@ loader.lazyRequireGetter(this, "Poller",
   "devtools/client/shared/poller", true);
 
 loader.lazyRequireGetter(this, "CompatUtils",
-  "devtools/shared/performance/legacy/compatibility");
+  "devtools/client/performance/legacy/compatibility");
 loader.lazyRequireGetter(this, "RecordingUtils",
-  "devtools/shared/performance/utils");
+  "devtools/shared/performance/recording-utils");
 loader.lazyRequireGetter(this, "TimelineFront",
   "devtools/server/actors/timeline", true);
 loader.lazyRequireGetter(this, "ProfilerFront",

devtools/client/performance/legacy/front.js

@@ -12,13 +12,13 @@ loader.lazyRequireGetter(this, "extend",
   "sdk/util/object", true);
 
 loader.lazyRequireGetter(this, "Actors",
-  "devtools/shared/performance/legacy/actors");
+  "devtools/client/performance/legacy/actors");
 loader.lazyRequireGetter(this, "LegacyPerformanceRecording",
-  "devtools/shared/performance/legacy/recording", true);
+  "devtools/client/performance/legacy/recording", true);
 loader.lazyRequireGetter(this, "importRecording",
-  "devtools/shared/performance/legacy/recording", true);
+  "devtools/client/performance/legacy/recording", true);
 loader.lazyRequireGetter(this, "normalizePerformanceFeatures",
-  "devtools/shared/performance/utils", true);
+  "devtools/shared/performance/recording-utils", true);
 loader.lazyRequireGetter(this, "DevToolsUtils",
   "devtools/shared/DevToolsUtils");
 loader.lazyRequireGetter(this, "getDeviceFront",

devtools/client/performance/legacy/moz.build

@@ -0,0 +1,12 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DevToolsModules(
+    'actors.js',
+    'compatibility.js',
+    'front.js',
+    'recording.js',
+)

devtools/client/performance/legacy/recording.js

@@ -7,9 +7,9 @@ const { Cc, Ci, Cu, Cr } = require("chrome");
 const { Task } = require("resource://gre/modules/Task.jsm");
 
 loader.lazyRequireGetter(this, "PerformanceIO",
-  "devtools/shared/performance/io");
+  "devtools/client/performance/modules/io");
 loader.lazyRequireGetter(this, "RecordingUtils",
-  "devtools/shared/performance/utils");
+  "devtools/shared/performance/recording-utils");
 loader.lazyRequireGetter(this, "PerformanceRecordingCommon",
   "devtools/shared/performance/recording-common", true);
 loader.lazyRequireGetter(this, "merge", "sdk/util/object", true);

devtools/client/performance/modules/io.js

@@ -8,7 +8,7 @@ const { Cc, Ci, Cu, Cr } = require("chrome");
 loader.lazyRequireGetter(this, "Services");
 loader.lazyRequireGetter(this, "promise");
 loader.lazyRequireGetter(this, "RecordingUtils",
-  "devtools/shared/performance/utils");
+  "devtools/shared/performance/recording-utils");
 
 loader.lazyImporter(this, "FileUtils",
   "resource://gre/modules/FileUtils.jsm");

devtools/client/performance/modules/moz.build

@@ -10,5 +10,6 @@ DIRS += [
 
 DevToolsModules(
     'global.js',
+    'io.js',
     'markers.js',
 )

devtools/client/performance/moz.build

@@ -4,6 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
+    'legacy',
     'modules',
 ]
 

devtools/client/performance/performance-controller.js

@@ -35,7 +35,7 @@ loader.lazyRequireGetter(this, "PerformanceTelemetry",
 loader.lazyRequireGetter(this, "TIMELINE_BLUEPRINT",
   "devtools/client/performance/modules/markers", true);
 loader.lazyRequireGetter(this, "RecordingUtils",
-  "devtools/shared/performance/utils");
+  "devtools/shared/performance/recording-utils");
 loader.lazyRequireGetter(this, "GraphsController",
   "devtools/client/performance/modules/widgets/graphs", true);
 loader.lazyRequireGetter(this, "OptimizationsGraph",

devtools/client/performance/test/browser.ini

@@ -47,6 +47,9 @@ skip-if = true # Bug 1161817
 [browser_perf-legacy-front-04.js]
 [browser_perf-legacy-front-05.js]
 [browser_perf-legacy-front-06.js]
+[browser_perf-legacy-front-07.js]
+[browser_perf-legacy-front-08.js]
+[browser_perf-legacy-front-09.js]
 [browser_perf-loading-01.js]
 [browser_perf-loading-02.js]
 [browser_perf-marker-details-01.js]

devtools/client/performance/test/browser_perf-legacy-front-07.js

@@ -7,12 +7,10 @@
 
 var WAIT_TIME = 100;
 
-const { TargetFactory } = require("devtools/client/framework/target");
-const { LegacyPerformanceFront } = require("devtools/shared/performance/legacy/front");
-const { merge } = require("sdk/util/object");
+const { LegacyPerformanceFront } = require("devtools/client/performance/legacy/front");
 
-add_task(function*() {
-  let tab = yield getTab(MAIN_DOMAIN + "doc_perf.html");
+function* spawnTest() {
+  let tab = yield getTab(SIMPLE_URL);
   let target = TargetFactory.forTab(tab);
   yield target.makeRemote();
 
@@ -57,9 +55,8 @@ add_task(function*() {
   checkSystemInfo(recording, "Client");
 
   yield front.destroy();
-  yield closeDebuggerClient(target.client);
   gBrowser.removeCurrentTab();
-});
+}
 
 function isEmptyArray (array, name) {
   ok(Array.isArray(array), `${name} is an array`);

devtools/client/performance/test/browser_perf-legacy-front-08.js

@@ -7,12 +7,10 @@
 
 var WAIT_TIME = 100;
 
-const { TargetFactory } = require("devtools/client/framework/target");
-const { LegacyPerformanceFront } = require("devtools/shared/performance/legacy/front");
-const { merge } = require("sdk/util/object");
+const { LegacyPerformanceFront } = require("devtools/client/performance/legacy/front");
 
-add_task(function*() {
-  let tab = yield getTab(MAIN_DOMAIN + "doc_perf.html");
+function* spawnTest() {
+  let tab = yield getTab(SIMPLE_URL);
   let target = TargetFactory.forTab(tab);
   yield target.makeRemote();
 
@@ -55,9 +53,8 @@ add_task(function*() {
   ok(recording.getProfile().threads[0].samples.data.length, "profile data has some samples");
 
   yield front.destroy();
-  yield closeDebuggerClient(target.client);
   gBrowser.removeCurrentTab();
-});
+}
 
 function isEmptyArray (array, name) {
   ok(Array.isArray(array), `${name} is an array`);

devtools/client/performance/test/browser_perf-legacy-front-09.js

@@ -7,12 +7,10 @@
  * `getBufferUsage()` values.
  */
 
-const { TargetFactory } = require("devtools/client/framework/target");
-const { LegacyPerformanceFront } = require("devtools/shared/performance/legacy/front");
-const { merge } = require("sdk/util/object");
+const { LegacyPerformanceFront } = require("devtools/client/performance/legacy/front");
 
-add_task(function*() {
-  let tab = yield getTab(MAIN_DOMAIN + "doc_perf.html");
+function* spawnTest() {
+  let tab = yield getTab(SIMPLE_URL);
   let target = TargetFactory.forTab(tab);
   yield target.makeRemote();
 
@@ -33,9 +31,8 @@ add_task(function*() {
 
   yield front.stopRecording(model);
   yield front.destroy();
-  yield closeDebuggerClient(target.client);
   gBrowser.removeCurrentTab();
-});
+}
 
 function getTab (url) {
   let tab = gBrowser.selectedTab = gBrowser.addTab();

devtools/client/performance/test/head.js

@@ -16,7 +16,7 @@ var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { DebuggerServer } = require("devtools/server/main");
 var { merge } = require("sdk/util/object");
 var { createPerformanceFront } = require("devtools/server/actors/performance");
-var RecordingUtils = require("devtools/shared/performance/utils");
+var RecordingUtils = require("devtools/shared/performance/recording-utils");
 var {
   PMM_loadFrameScripts, PMM_isProfilerActive, PMM_stopProfiler,
   sendProfilerCommand, consoleMethod

devtools/client/performance/test/unit/head.js

@@ -7,7 +7,7 @@ var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 var { require } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
 var { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
 var { console } = require("resource://gre/modules/devtools/shared/Console.jsm");
-const RecordingUtils = require("devtools/shared/performance/utils");
+const RecordingUtils = require("devtools/shared/performance/recording-utils");
 
 const PLATFORM_DATA_PREF = "devtools.performance.ui.show-platform-data";
 

devtools/client/performance/test/unit/test_perf-utils-allocations-to-samples.js

@@ -12,7 +12,7 @@ function run_test() {
 }
 
 add_task(function () {
-  const { getProfileThreadFromAllocations } = require("devtools/shared/performance/utils");
+  const { getProfileThreadFromAllocations } = require("devtools/shared/performance/recording-utils");
   let output = getProfileThreadFromAllocations(TEST_DATA);
   equal(output.toSource(), EXPECTED_OUTPUT.toSource(), "The output is correct.");
 });

devtools/client/performance/test/unit/test_tree-model-allocations-01.js

@@ -12,7 +12,7 @@ function run_test() {
 
 add_task(function () {
   let { ThreadNode } = require("devtools/client/performance/modules/logic/tree-model");
-  const { getProfileThreadFromAllocations } = require("devtools/shared/performance/utils");
+  const { getProfileThreadFromAllocations } = require("devtools/shared/performance/recording-utils");
   let allocationData = getProfileThreadFromAllocations(TEST_DATA);
   let thread = new ThreadNode(allocationData, { startTime: 0, endTime: 1000 });
 

devtools/client/performance/test/unit/test_tree-model-allocations-02.js

@@ -12,7 +12,7 @@ function run_test() {
 
 add_task(function () {
   let { ThreadNode } = require("devtools/client/performance/modules/logic/tree-model");
-  const { getProfileThreadFromAllocations } = require("devtools/shared/performance/utils");
+  const { getProfileThreadFromAllocations } = require("devtools/shared/performance/recording-utils");
   let allocationData = getProfileThreadFromAllocations(TEST_DATA);
   let thread = new ThreadNode(allocationData, { invertTree: true, startTime: 0, endTime: 1000 });
 

devtools/client/shared/test/head.js

@@ -251,7 +251,7 @@ function* openAndCloseToolbox(nbOfTimes, usageTime, toolId) {
  * Synthesize a profile for testing.
  */
 function synthesizeProfileForTest(samples) {
-  const RecordingUtils = require("devtools/shared/performance/utils");
+  const RecordingUtils = require("devtools/shared/performance/recording-utils");
 
   samples.unshift({
     time: 0,

devtools/server/actors/performance-recording.js

@@ -12,9 +12,9 @@ const { actorBridge } = require("devtools/server/actors/common");
 loader.lazyRequireGetter(this, "events", "sdk/event/core");
 loader.lazyRequireGetter(this, "merge", "sdk/util/object", true);
 loader.lazyRequireGetter(this, "PerformanceIO",
-  "devtools/shared/performance/io");
+  "devtools/client/performance/modules/io");
 loader.lazyRequireGetter(this, "RecordingUtils",
-  "devtools/shared/performance/utils");
+  "devtools/shared/performance/recording-utils");
 loader.lazyRequireGetter(this, "PerformanceRecordingCommon",
   "devtools/shared/performance/recording-common", true);
 

devtools/server/actors/performance.js

@@ -15,13 +15,13 @@ loader.lazyRequireGetter(this, "events", "sdk/event/core");
 loader.lazyRequireGetter(this, "extend", "sdk/util/object", true);
 
 loader.lazyRequireGetter(this, "PerformanceRecorder",
-  "devtools/shared/performance/recorder", true);
+  "devtools/server/performance/recorder", true);
 loader.lazyRequireGetter(this, "PerformanceIO",
-  "devtools/shared/performance/io");
+  "devtools/client/performance/modules/io");
 loader.lazyRequireGetter(this, "normalizePerformanceFeatures",
-  "devtools/shared/performance/utils", true);
+  "devtools/shared/performance/recording-utils", true);
 loader.lazyRequireGetter(this, "LegacyPerformanceFront",
-  "devtools/shared/performance/legacy/front", true);
+  "devtools/client/performance/legacy/front", true);
 loader.lazyRequireGetter(this, "getSystemInfo",
   "devtools/shared/system", true);
 

devtools/server/moz.build

@@ -8,6 +8,7 @@ include('../templates.mozbuild')
 
 DIRS += [
     'actors',
+    'performance',
     'shims',
 ]
 

devtools/server/performance/moz.build

@@ -5,8 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
-  'actors.js',
-  'compatibility.js',
-  'front.js',
-  'recording.js',
+    'recorder.js',
 )

devtools/server/performance/recorder.js

@@ -28,7 +28,7 @@ loader.lazyRequireGetter(this, "PerformanceRecordingActor",
 loader.lazyRequireGetter(this, "PerformanceRecordingFront",
   "devtools/server/actors/performance-recording", true);
 loader.lazyRequireGetter(this, "mapRecordingOptions",
-  "devtools/shared/performance/utils", true);
+  "devtools/shared/performance/recording-utils", true);
 loader.lazyRequireGetter(this, "DevToolsUtils",
   "devtools/shared/DevToolsUtils");
 loader.lazyRequireGetter(this, "getSystemInfo",

devtools/server/tests/browser/browser.ini

@@ -58,12 +58,6 @@ skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still di
 skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-allocation-data.js]
 skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
-[browser_perf-legacy-front-01.js]
-skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
-[browser_perf-legacy-front-02.js]
-skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
-[browser_perf-legacy-front-03.js]
-skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-profiler-01.js]
 [browser_perf-profiler-02.js]
 skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S

devtools/shared/performance/moz.build

@@ -4,16 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += [
-    'legacy',
-]
-
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
 
 DevToolsModules(
-  'io.js',
-  'process-communication.js',
-  'recorder.js',
-  'recording-common.js',
-  'utils.js',
+    'process-communication.js',
+    'recording-common.js',
+    'recording-utils.js',
 )

devtools/shared/performance/test/test_perf-utils-allocations-to-samples.js

@@ -12,7 +12,7 @@ function run_test() {
 }
 
 add_task(function () {
-  const { getProfileThreadFromAllocations } = require("devtools/shared/performance/utils");
+  const { getProfileThreadFromAllocations } = require("devtools/shared/performance/recording-utils");
   let output = getProfileThreadFromAllocations(TEST_DATA);
   equal(output.toSource(), EXPECTED_OUTPUT.toSource(), "The output is correct.");
 });