Bug 1084483 - Disable/remove tracking of peak link.exe memory. r=coop
authorJoel Maher <jmaher@mozilla.com>
Wed, 29 Apr 2015 13:26:20 -0400
changeset 4214 c8d37797bbd8d88873581554b9f9576e3c6b8526
parent 4204 9689eb70facebddaf1de347f75b451e83468403c
child 4218 208e1285bfe2282ea3edaf75fa3fcb4a524d5a4c
child 4228 0225d58548652ed516736873e5ed718fa8c235a0
push id3518
push userjmaher@mozilla.com
push dateWed, 29 Apr 2015 17:26:48 +0000
reviewerscoop
bugs1084483
Bug 1084483 - Disable/remove tracking of peak link.exe memory. r=coop
misc.py
process/factory.py
--- a/misc.py
+++ b/misc.py
@@ -1800,17 +1800,16 @@ def generateBranchObjects(config, name, 
             # builder_tracker just checks to see if we used
             # mozharness to create this builder already. Once we port all
             # builders to mozharness we won't need pgo_builder at
             # all
             if (config['pgo_strategy'] in ('periodic', 'try') and
                     platform in config['pgo_platforms'] and not
                     builder_tracker['done_pgo_build']):
                 pgo_kwargs = factory_kwargs.copy()
-                pgo_kwargs["doPostLinkerSize"] = pf.get('enable_post_linker_size', False)
                 pgo_kwargs['profiledBuild'] = True
                 pgo_kwargs['stagePlatform'] += '-pgo'
                 pgo_kwargs['unittestBranch'] = pgoUnittestBranch
                 pgo_factory = factory_class(**pgo_kwargs)
                 pgo_builder = {
                     'name': '%s pgo-build' % pf['base_name'],
                     'slavenames': pf['slaves'],
                     'builddir': '%s-%s-pgo' % (name, platform),
--- a/process/factory.py
+++ b/process/factory.py
@@ -811,17 +811,16 @@ class MercurialBuildFactory(MozillaBuild
                  packageSDK=False, packageTests=False, mozillaDir=None,
                  mozillaSrcDir=None,
                  enable_ccache=False, stageLogBaseUrl=None,
                  triggeredSchedulers=None, triggerBuilds=False,
                  useSharedCheckouts=False,
                  stagePlatform=None, testPrettyNames=False, l10nCheckTest=False,
                  disableSymbols=False,
                  doBuildAnalysis=False,
-                 doPostLinkerSize=False,
                  multiLocale=False,
                  multiLocaleMerge=True,
                  compareLocalesRepoPath=None,
                  compareLocalesTag='RELEASE_AUTOMATION',
                  mozharnessRepoPath=None,
                  mozharnessTag='default',
                  mozharness_repo_cache=None,
                  tools_repo_cache=None,
@@ -864,17 +863,16 @@ class MercurialBuildFactory(MozillaBuild
         self.stageGroup = stageGroup
         self.stageSshKey = stageSshKey
         self.stageBasePath = stageBasePath
         if stageBasePath and not stageProduct:
             self.stageProduct = productName
         else:
             self.stageProduct = stageProduct
         self.doBuildAnalysis = doBuildAnalysis
-        self.doPostLinkerSize = doPostLinkerSize
         self.updatePlatform = updatePlatform
         self.downloadBaseURL = downloadBaseURL
         self.nightly = nightly
         self.checkTest = checkTest
         self.valgrindCheck = valgrindCheck
         self.graphServer = graphServer
         self.graphSelector = graphSelector
         self.graphBranch = graphBranch
@@ -1183,18 +1181,16 @@ class MercurialBuildFactory(MozillaBuild
         self.addPreBuildSteps()
         self.addSourceSteps()
         self.addConfigSteps()
         if self.signingServers and self.enableSigning:
             self.addGetTokenSteps()
         self.addDoBuildSteps()
         if self.doBuildAnalysis:
             self.addBuildAnalysisSteps()
-        if self.doPostLinkerSize:
-            self.addPostLinkerSizeSteps()
 
     def addPreBuildSteps(self):
         if self.nightly:
             self.addStep(ShellCommand(
                          name='rm_builddir',
                          command=['rm', '-rf', 'build'],
                          env=self.env,
                          workdir='.',
@@ -1422,44 +1418,16 @@ class MercurialBuildFactory(MozillaBuild
                                              propertiesFile="properties.json"))
             else:
                 self.addStep(OutputStep(
                     name='tinderboxprint_ctors',
                     data=WithProperties(
                         'TinderboxPrint: num_ctors: %(num_ctors:-unknown)s'),
                 ))
 
-    def addPostLinkerSizeSteps(self):
-        # Analyze the linker max vsize
-        def get_linker_vsize(rc, stdout, stderr):
-            try:
-                vsize = int(stdout)
-                testresults = [('libxul_link', 'libxul_link', vsize, str(vsize))]
-                return dict(vsize=vsize, testresults=testresults)
-            except:
-                return {'testresults': []}
-
-        self.addStep(SetProperty(
-            name='get_linker_vsize',
-            command=['cat', '%s\\toolkit\\library\\linker-vsize' % self.mozillaObjdir],
-            extract_fn=get_linker_vsize,
-            ))
-        self.addBuildInfoSteps()
-        self.addStep(JSONPropertiesDownload(slavedest="properties.json"))
-        gs_env = self.env.copy()
-        gs_env['PYTHONPATH'] = WithProperties('%(toolsdir)s/lib/python')
-        self.addStep(GraphServerPost(server=self.graphServer,
-                                     selector=self.graphSelector,
-                                     branch=self.graphBranch,
-                                     resultsname=self.baseName,
-                                     env=gs_env,
-                                     flunkOnFailure=False,
-                                     haltOnFailure=False,
-                                     propertiesFile="properties.json"))
-
     def addCheckTestSteps(self):
         env = self.env.copy()
         env['MINIDUMP_STACKWALK'] = getPlatformMinidumpPath(self.platform)
         env['MINIDUMP_SAVE_PATH'] = WithProperties('%(basedir:-)s/minidumps')
         self.addStep(MockMozillaCheck(
                      test_name="check",
                      makeCmd=self.makeCmd,
                      warnOnWarnings=True,