Bug 1524992 - Use Marionette for Linux profile runs r=mshal
☠☠ backed out by 88ffdaa924cd ☠ ☠
authorJames Willcox <snorp@snorp.net>
Mon, 04 Mar 2019 22:07:02 +0000
changeset 462285 face9d1e886872033b70fbdff5a40eaa244db3fb
parent 462284 ae1e20a595c44100776589dcc1f76418208c88c7
child 462286 a1fc95a1f08d57bf14bd36b6420ccf9f8035e443
push id35646
push useraciure@mozilla.com
push dateTue, 05 Mar 2019 04:19:19 +0000
treeherdermozilla-central@7c5b913dc2e3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1524992
milestone67.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 1524992 - Use Marionette for Linux profile runs r=mshal Differential Revision: https://phabricator.services.mozilla.com/D21609
build/pgo/index.html
build/pgo/profileserver.py
--- a/build/pgo/index.html
+++ b/build/pgo/index.html
@@ -50,20 +50,20 @@
  function loadURL () {
      var interval = defaultInterval;
      if (idx == 0) {
          interval = 90000;
      }
      w.close();
      w = window.open(list[idx++]);
      if (idx < list.length) {
-     window.setTimeout(loadURL, interval);
+       window.setTimeout(loadURL, interval);
      } else {
-         window.setTimeout(Quitter.quit, interval);
+       window.postMessage("quit");
      }
  }
  var i;
  
  for(i=0; i < list.length;i++) {
      document.write(list[i]);
      document.write("<br>");
  }
-  </script>
+</script>
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -1,144 +1,119 @@
 #!/usr/bin/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/.
 
 import json
 import os
-import sys
 
 from buildconfig import substs
 from mozbuild.base import MozbuildObject
 from mozfile import TemporaryDirectory
 from mozhttpd import MozHttpd
-from mozprofile import FirefoxProfile, Preferences
-from mozprofile.permissions import ServerLocations
-from mozrunner import FirefoxRunner, CLI
+from mozprofile import Preferences
+from mozrunner import CLI
 from six import string_types
 
+from marionette_driver.marionette import Marionette
+
 PORT = 8888
 
 PATH_MAPPINGS = {
     '/js-input/webkit/PerformanceTests': 'third_party/webkit/PerformanceTests',
 }
 
-
 if __name__ == '__main__':
     cli = CLI()
     debug_args, interactive = cli.debugger_arguments()
     runner_args = cli.runner_args()
 
     build = MozbuildObject.from_environment()
 
     binary = runner_args.get('binary')
     if not binary:
         binary = build.get_binary_path(where="staged-package")
 
     path_mappings = {
         k: os.path.join(build.topsrcdir, v)
         for k, v in PATH_MAPPINGS.items()
     }
-    httpd = MozHttpd(port=PORT,
-                     docroot=os.path.join(build.topsrcdir, "build", "pgo"),
-                     path_mappings=path_mappings)
+    httpd = MozHttpd(
+        port=PORT,
+        docroot=os.path.join(build.topsrcdir, "build", "pgo"),
+        path_mappings=path_mappings)
     httpd.start(block=False)
 
-    locations = ServerLocations()
-    locations.add_host(host='127.0.0.1',
-                       port=PORT,
-                       options='primary,privileged')
-
     with TemporaryDirectory() as profilePath:
         # TODO: refactor this into mozprofile
         profile_data_dir = os.path.join(build.topsrcdir, 'testing', 'profiles')
         with open(os.path.join(profile_data_dir, 'profiles.json'), 'r') as fh:
             base_profiles = json.load(fh)['profileserver']
 
-        prefpaths = [os.path.join(profile_data_dir, profile, 'user.js')
-                     for profile in base_profiles]
+        prefpaths = [
+            os.path.join(profile_data_dir, profile, 'user.js')
+            for profile in base_profiles
+        ]
 
         prefs = {}
         for path in prefpaths:
             prefs.update(Preferences.read_prefs(path))
 
-        interpolation = {"server": "%s:%d" % httpd.httpd.server_address,
-                         "OOP": "false"}
+        interpolation = {
+            "server": "%s:%d" % httpd.httpd.server_address,
+            "OOP": "false"
+        }
         for k, v in prefs.items():
             if isinstance(v, string_types):
                 v = v.format(**interpolation)
             prefs[k] = Preferences.cast(v)
 
-        profile = FirefoxProfile(profile=profilePath,
-                                 preferences=prefs,
-                                 addons=[os.path.join(
-                                     build.topsrcdir, 'tools', 'quitter',
-                                     'quitter@mozilla.org.xpi')],
-                                 locations=locations)
-
-        env = os.environ.copy()
-        env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
-        env["XPCOM_DEBUG_BREAK"] = "warn"
+        env = os.environ
+        env["XPCOM_DEBUG_BREAK"] = "1"
 
         # For VC12+, make sure we can find the right bitness of pgort1x0.dll
         if not substs.get('HAVE_64BIT_BUILD'):
             for e in ('VS140COMNTOOLS', 'VS120COMNTOOLS'):
                 if e not in env:
                     continue
 
                 vcdir = os.path.abspath(os.path.join(env[e], '../../VC/bin'))
                 if os.path.exists(vcdir):
                     env['PATH'] = '%s;%s' % (vcdir, env['PATH'])
                     break
 
         # Add MOZ_OBJDIR to the env so that cygprofile.cpp can use it.
         env["MOZ_OBJDIR"] = build.topobjdir
 
+        jarlog = env.get("JARLOG_FILE")
+        if jarlog:
+            abs_jarlog = os.path.abspath(jarlog)
+            env["MOZ_JAR_LOG_FILE"] = abs_jarlog
+            print("jarlog: %s" % abs_jarlog)
+
         # Write to an output file if we're running in automation
-        process_args = {}
+        process_args = []
+        logfile = None
         if 'UPLOAD_PATH' in env:
-            process_args['logfile'] = os.path.join(env['UPLOAD_PATH'], 'profile-run-1.log')
+            logfile = os.path.join(env['UPLOAD_PATH'], 'profile-run.log')
 
         # Run Firefox a first time to initialize its profile
-        runner = FirefoxRunner(profile=profile,
-                               binary=binary,
-                               cmdargs=['data:text/html,<script>Quitter.quit()</script>'],
-                               env=env,
-                               process_args=process_args)
-        runner.start()
-        ret = runner.wait()
-        if ret:
-            print("Firefox exited with code %d during profile initialization"
-                  % ret)
-            logfile = process_args.get('logfile')
-            if logfile:
-                print("Firefox output (%s):" % logfile)
-                with open(logfile) as f:
-                    print(f.read())
-            httpd.stop()
-            sys.exit(ret)
+        driver = Marionette(bin=binary, prefs=prefs, gecko_log=logfile)
+        driver.start_session()
+        driver.restart(in_app=True)
 
-        jarlog = os.getenv("JARLOG_FILE")
-        if jarlog:
-            env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
-            print("jarlog: %s" % env["MOZ_JAR_LOG_FILE"])
+        # Now generate the profile and wait for it to complete
+        driver.navigate("http://localhost:%d/index.html" % PORT)
+        driver.execute_async_script(
+            '''
+            const [resolve] = arguments;
+            window.addEventListener('message', event => {
+                if (event.data === 'quit') {
+                    resolve();
+                }
+            });
+            ''',
+            script_timeout=999999999)
 
-        if 'UPLOAD_PATH' in env:
-            process_args['logfile'] = os.path.join(env['UPLOAD_PATH'], 'profile-run-2.log')
-        cmdargs = ["http://localhost:%d/index.html" % PORT]
-        runner = FirefoxRunner(profile=profile,
-                               binary=binary,
-                               cmdargs=cmdargs,
-                               env=env,
-                               process_args=process_args)
-        runner.start(debug_args=debug_args, interactive=interactive)
-        ret = runner.wait()
+        driver.quit(in_app=True)
         httpd.stop()
-        if ret:
-            print("Firefox exited with code %d during profiling" % ret)
-            logfile = process_args.get('logfile')
-            if logfile:
-                print("Firefox output (%s):" % logfile)
-                with open(logfile) as f:
-                    print(f.read())
-            sys.exit(ret)