Backed out 3 changesets (bug 1488554) for build bustage at configure\test_toolchain_configure.py on a CLOSED TREE
authorGurzau Raul <rgurzau@mozilla.com>
Wed, 05 Sep 2018 04:10:31 +0300
changeset 434752 9dc064f701b6df79d4fd3ca7ab8f7cecc5870aaa
parent 434751 e2a02b08089b0bd0c18ceac0b2eb1e3888d56dc2
child 434753 87a5f1f234e5d4a18f4c0d0945988b3561a503f2
push id34577
push userebalazs@mozilla.com
push dateWed, 05 Sep 2018 09:45:59 +0000
treeherdermozilla-central@019d95c8106d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1488554
milestone64.0a1
backs outa21462dc142ad715926864ac5ccccadcdc2595f7
6a34f57792812095e45386c276940b652f947d7a
0d03acc584bc60a593f8b2865e82b78cfca9adaf
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
Backed out 3 changesets (bug 1488554) for build bustage at configure\test_toolchain_configure.py on a CLOSED TREE Backed out changeset a21462dc142a (bug 1488554) Backed out changeset 6a34f5779281 (bug 1488554) Backed out changeset 0d03acc584bc (bug 1488554)
testing/talos/talos/run_tests.py
testing/talos/talos/xtalos/etlparser.py
toolkit/moz.configure
--- a/testing/talos/talos/run_tests.py
+++ b/testing/talos/talos/run_tests.py
@@ -9,17 +9,16 @@ import copy
 import os
 import subprocess
 import sys
 import time
 import traceback
 import urllib
 
 import mozhttpd
-import mozinfo
 import mozversion
 import utils
 from mozlog import get_proxy_logger
 from talos.config import get_configs, ConfigurationError
 from talos.mitmproxy import mitmproxy
 from talos.results import TalosResults
 from talos.ttest import TTest
 from talos.utils import TalosError, TalosRegression
@@ -118,20 +117,17 @@ def run_tests(config, browser_config):
             test['preferences']['dom.performance.time_to_non_blank_paint.enabled'] = True
 
         test['setup'] = utils.interpolate(test['setup'])
         test['cleanup'] = utils.interpolate(test['cleanup'])
 
         if not test.get('profile', False):
             test['profile'] = config.get('profile')
 
-    if mozinfo.os == 'win':
-        browser_config['extra_args'] = ['--no-deelevate', '--wait-for-browser']
-    else:
-        browser_config['extra_args'] = []
+    browser_config['extra_args'] = []
 
     # pass --no-remote to firefox launch, if --develop is specified
     # we do that to allow locally the user to have another running firefox
     # instance
     if browser_config['develop']:
         browser_config['extra_args'].append('--no-remote')
 
     # Pass subtests filter argument via a preference
--- a/testing/talos/talos/xtalos/etlparser.py
+++ b/testing/talos/talos/xtalos/etlparser.py
@@ -13,17 +13,16 @@ import shutil
 import subprocess
 import sys
 
 import xtalos
 
 EVENTNAME_INDEX = 0
 PROCESS_INDEX = 2
 THREAD_ID_INDEX = 3
-PARENT_PID_INDEX = 3
 DISKBYTES_COL = "Size"
 FNAME_COL = "FileName"
 IMAGEFUNC_COL = "Image!Function"
 EVENTGUID_COL = "EventGuid"
 ACTIVITY_ID_COL = "etw:ActivityId"
 NUMBYTES_COL = "NumBytes"
 BYTESSENT_COL = "BytesSent"
 
@@ -46,17 +45,16 @@ net_events = {
     "TcpDataTransferReceive": "recv",
     "UdpEndpointReceiveMessages": "recv",
     "TcpDataTransferSend": "send",
     "UdpEndpointSendMessages": "send"
 }
 gThreads = {}
 gConnectionIDs = {}
 gHeaders = {}
-gBrowserPID = None
 
 
 def uploadFile(filename):
     mud = os.environ.get('MOZ_UPLOAD_DIR', None)
     if mud:
         print("uploading raw file %s via blobber" % filename)
         mud_filename = os.path.join(mud, filename)
         shutil.copyfile(filename, "%s.log" % mud_filename)
@@ -196,41 +194,22 @@ def etl2csv(xperf_path, etl_filename, de
                  '-i', etl_filename,
                  '-o', csv_filename]
     if debug:
         print("executing '%s'" % subprocess.list2cmdline(xperf_cmd))
     subprocess.call(xperf_cmd)
     return csv_filename
 
 
-def trackProcess(row, firstFirefoxPID):
-    global gBrowserPID
-    if gBrowserPID:
-        return
-
-    # Without the launcher, the initial Firefox process *is* the browser
-    # process. OTOH, with the launcher process enabled, the browser is actually
-    # the first child process of the first Firefox process.
-    parentPID = int(row[PARENT_PID_INDEX])
-    if parentPID == firstFirefoxPID:
-        proc = row[PROCESS_INDEX]
-        gBrowserPID = int(re.search("^.* \(\s*(\d+)\)$", proc).group(1))
-
-
-def getBrowserPID():
-    global gBrowserPID
-    return gBrowserPID
-
-
-def trackThread(row, browserPID):
+def trackThread(row, firefoxPID):
     event, proc, tid = \
         row[EVENTNAME_INDEX], row[PROCESS_INDEX], row[THREAD_ID_INDEX]
     if event in ["T-DCStart", "T-Start"]:
         procName, procID = re.search("^(.*) \(\s*(\d+)\)$", proc).group(1, 2)
-        if procID == str(browserPID):
+        if procID == str(firefoxPID):
             imgIdx = getIndex(event, IMAGEFUNC_COL)
             img = re.match("([^!]+)!", row[imgIdx]).group(1)
             if img == procName:
                 gThreads[tid] = "main"
             else:
                 gThreads[tid] = "nonmain"
     elif event in ["T-DCEnd", "T-End"] and tid in gThreads:
         del gThreads[tid]
@@ -335,20 +314,18 @@ def etlparser(xperf_path, etl_filename, 
     files = {}
     io = {}
     stage = 0
 
     print("reading etl filename: %s" % etl_filename)
     csvname = etl2csv(xperf_path, etl_filename, debug=debug)
     for row in readFile(csvname):
         event = row[EVENTNAME_INDEX]
-        if event == "P-Start":
-            trackProcess(row, processID)
-        elif event in ["T-DCStart", "T-Start", "T-DCEnd", "T-End"]:
-            trackThread(row, getBrowserPID())
+        if event in ["T-DCStart", "T-Start", "T-DCEnd", "T-End"]:
+            trackThread(row, processID)
         elif event in ["FileIoRead", "FileIoWrite"] and \
                 row[THREAD_ID_INDEX] in gThreads:
             fileSummary(row, stage, files)
             trackThreadFileIO(row, io, stage)
         elif event.endswith("Event/Classic") and \
                 row[THREAD_ID_INDEX] in gThreads:
             stage = updateStage(row, stage)
         elif event.startswith("Microsoft-Windows-TCPIP"):
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1050,22 +1050,17 @@ def unsigned_addon_scopes(scopes):
     )
 
 set_config('MOZ_UNSIGNED_APP_SCOPE', unsigned_addon_scopes.app)
 set_config('MOZ_UNSIGNED_SYSTEM_SCOPE', unsigned_addon_scopes.system)
 
 # Launcher process (Windows only)
 # ==============================================================
 
-@depends(target, milestone)
-def launcher_process_default(target, milestone):
-    return target.os == 'WINNT' and milestone.is_nightly
-
-option('--enable-launcher-process', default=launcher_process_default,
-       help='Enable launcher process by default')
+option('--enable-launcher-process', help='Enable launcher process by default')
 
 @depends('--enable-launcher-process', target)
 def launcher(value, target):
     enabled = bool(value)
     if enabled and target.os != 'WINNT':
         die('Cannot enable launcher process on %s', target.os)
     if enabled:
         return True