Bug 1084483 - Disable/remove tracking of peak link.exe memory. r=coop
--- a/configs/b2g/desktop_linux32.py
+++ b/configs/b2g/desktop_linux32.py
@@ -48,17 +48,16 @@ config = {
#########################################################################
###### 32 bit specific ######
'base_name': 'B2G_%(branch)s_linux32_gecko',
'platform': 'linux32_gecko',
'stage_platform': 'linux32_gecko',
'stage_product': 'b2g',
- 'enable_max_vsize': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
--- a/configs/b2g/desktop_linux64.py
+++ b/configs/b2g/desktop_linux64.py
@@ -48,17 +48,16 @@ config = {
#########################################################################
###### 64 bit specific ######
'base_name': 'B2G_%(branch)s_linux64_gecko',
'platform': 'linux64_gecko',
'stage_platform': 'linux64_gecko',
'stage_product': 'b2g',
- 'enable_max_vsize': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
--- a/configs/b2g/desktop_macosx64.py
+++ b/configs/b2g/desktop_macosx64.py
@@ -33,17 +33,16 @@ config = {
#########################################################################
###### 64 bit specific ######
'base_name': 'B2G_%(branch)s_macosx64_gecko',
'platform': 'macosx64_gecko',
'stage_platform': 'macosx64_gecko',
'stage_product': 'b2g',
- 'enable_max_vsize': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
'CHOWN_ROOT': '~/bin/chown_root',
'CHOWN_REVERT': '~/bin/chown_revert',
'TINDERBOX_OUTPUT': '1',
--- a/configs/b2g/desktop_windows32.py
+++ b/configs/b2g/desktop_windows32.py
@@ -60,17 +60,16 @@ config = {
#########################################################################
###### 32 bit specific ######
'base_name': 'B2G_%(branch)s_win32_gecko',
'platform': 'win32_gecko',
'stage_platform': 'win32_gecko',
'stage_product': 'b2g',
- 'enable_max_vsize': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/nsis-2.46u;C:/mozilla-build/python27;'
--- a/configs/builds/releng_base_linux_32_builds.py
+++ b/configs/builds/releng_base_linux_32_builds.py
@@ -53,17 +53,16 @@ config = {
#########################################################################
#########################################################################
###### 32 bit specific ######
'base_name': 'Linux_%(branch)s',
'platform': 'linux',
'stage_platform': 'linux',
- 'enable_max_vsize': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
--- a/configs/builds/releng_base_linux_64_builds.py
+++ b/configs/builds/releng_base_linux_64_builds.py
@@ -53,17 +53,16 @@ config = {
#########################################################################
#########################################################################
###### 64 bit specific ######
'base_name': 'Linux_x86-64_%(branch)s',
'platform': 'linux64',
'stage_platform': 'linux64',
- 'enable_max_vsize': False,
'use_platform_in_symbols_extra_buildid': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
--- a/configs/builds/releng_base_mac_64_builds.py
+++ b/configs/builds/releng_base_mac_64_builds.py
@@ -38,17 +38,16 @@ config = {
#########################################################################
#########################################################################
###### 64 bit specific ######
'base_name': 'OS X 10.7 %(branch)s',
'platform': 'macosx64',
'stage_platform': 'macosx64',
- 'enable_max_vsize': False,
'use_platform_in_symbols_extra_buildid': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
# SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
--- a/configs/builds/releng_base_windows_32_builds.py
+++ b/configs/builds/releng_base_windows_32_builds.py
@@ -60,17 +60,16 @@ config = {
#########################################################################
#########################################################################
###### 32 bit specific ######
'base_name': 'WINNT_5.2_%(branch)s',
'platform': 'win32',
'stage_platform': 'win32',
- 'enable_max_vsize': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/nsis-2.46u;C:/mozilla-build/python27;'
--- a/configs/builds/releng_base_windows_64_builds.py
+++ b/configs/builds/releng_base_windows_64_builds.py
@@ -60,17 +60,16 @@ config = {
#########################################################################
#########################################################################
###### 64 bit specific ######
'base_name': 'WINNT_6.1_x86-64_%(branch)s',
'platform': 'win64',
'stage_platform': 'win64',
- 'enable_max_vsize': False,
'env': {
'MOZ_SYMBOLS_EXTRA_BUILDID': 'win64',
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
'PATH': 'C:/mozilla-build/python27;C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
--- a/mozharness/mozilla/building/buildbase.py
+++ b/mozharness/mozilla/building/buildbase.py
@@ -1116,30 +1116,16 @@ or run without that action (ie: --no-{ac
testresults = [('num_ctors', 'num_ctors', num_ctors, str(num_ctors))]
self.set_buildbot_property('num_ctors',
num_ctors,
write_to_file=True)
self.set_buildbot_property('testresults',
testresults,
write_to_file=True)
- def _count_vsize(self):
- """gets linker vsize and sets it to testresults."""
- dirs = self.query_abs_dirs()
- vsize_path = os.path.join(
- dirs['abs_obj_dir'], 'toolkit', 'library', 'linker-vsize'
- )
- cmd = ['cat', vsize_path]
- vsize = self.get_output_from_command(cmd, cwd=dirs['abs_src_dir'])
- testresults = [('libxul_link', 'libxul_link', int(vsize), str(vsize))]
- self.set_buildbot_property('vsize', vsize, write_to_file=True)
- self.set_buildbot_property('testresults',
- testresults,
- write_to_file=True)
-
def _graph_server_post(self):
"""graph server post results."""
self._assert_cfg_valid_for_action(
['base_name', 'graph_server', 'graph_selector'],
'generate-build-stats'
)
c = self.config
dirs = self.query_abs_dirs()
@@ -1618,47 +1604,39 @@ or run without that action (ie: --no-{ac
AUTOMATION_EXIT_CODES[::-1]
)
self.error("'make -k check' did not run successfully. Please check "
"log for errors.")
def generate_build_stats(self):
"""grab build stats following a compile.
- This action handles all statitics from a build: 'count_ctors' and
- 'vsize' and then posts to graph server the results.
+ This action handles all statistics from a build: 'count_ctors'
+ and then posts to graph server the results.
We only post to graph server for non nightly build
"""
c = self.config
# grab any props available from this or previous unclobbered runs
self.generate_build_props(console_output=False,
halt_on_failure=False)
- # enable_max_vsize will be True for builds like pgo win32 builds
- # but not for nightlies (nightlies are pgo builds too so the
- # check is needed).
- enable_max_vsize = c.get('enable_max_vsize') and c.get('pgo_build')
-
- if enable_max_vsize or c.get('enable_count_ctors'):
+ if c.get('enable_count_ctors'):
if c.get('enable_count_ctors'):
self.info("counting ctors...")
self._count_ctors()
num_ctors = self.buildbot_properties.get('num_ctors', 'unknown')
self.info("TinderboxPrint: num_ctors: %s" % (num_ctors,))
- if enable_max_vsize:
- self.info("getting vsize...")
- self._count_vsize()
if not self.query_is_nightly():
self._graph_server_post()
else:
self.info("We are not posting to graph server as this is a "
"nightly build.")
else:
- self.info("Nothing to do for this action since ctors and vsize "
+ self.info("Nothing to do for this action since ctors "
"counts are disabled for this build.")
def _do_sendchange(self, test_type):
c = self.config
# grab any props available from this or previous unclobbered runs
self.generate_build_props(console_output=False,
halt_on_failure=False)