зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1782344 - Avoid getting ccache stats when ccache is not enabled. r=firefox-build-system-reviewers,ahochheiden
Differential Revision: https://phabricator.services.mozilla.com/D166635
This commit is contained in:
Родитель
972d84c63d
Коммит
8e5df06970
|
@ -569,10 +569,11 @@ class BuildMonitor(MozbuildObject):
|
||||||
"Swap in/out (MB): {sin}/{sout}",
|
"Swap in/out (MB): {sin}/{sout}",
|
||||||
)
|
)
|
||||||
|
|
||||||
def ccache_stats(self):
|
def ccache_stats(self, ccache=None):
|
||||||
ccache_stats = None
|
ccache_stats = None
|
||||||
|
|
||||||
ccache = mozfile.which("ccache")
|
if ccache is None:
|
||||||
|
ccache = mozfile.which("ccache")
|
||||||
if ccache:
|
if ccache:
|
||||||
# With CCache v3.7+ we can use --print-stats
|
# With CCache v3.7+ we can use --print-stats
|
||||||
has_machine_format = CCacheStats.check_version_3_7_or_newer(ccache)
|
has_machine_format = CCacheStats.check_version_3_7_or_newer(ccache)
|
||||||
|
@ -1145,7 +1146,6 @@ class BuildDriver(MozbuildObject):
|
||||||
warnings_path = self._get_state_filename("warnings.json")
|
warnings_path = self._get_state_filename("warnings.json")
|
||||||
monitor = self._spawn(BuildMonitor)
|
monitor = self._spawn(BuildMonitor)
|
||||||
monitor.init(warnings_path)
|
monitor.init(warnings_path)
|
||||||
ccache_start = monitor.ccache_stats()
|
|
||||||
footer = BuildProgressFooter(self.log_manager.terminal, monitor)
|
footer = BuildProgressFooter(self.log_manager.terminal, monitor)
|
||||||
|
|
||||||
# Disable indexing in objdir because it is not necessary and can slow
|
# Disable indexing in objdir because it is not necessary and can slow
|
||||||
|
@ -1219,6 +1219,12 @@ class BuildDriver(MozbuildObject):
|
||||||
|
|
||||||
config = self.reload_config_environment()
|
config = self.reload_config_environment()
|
||||||
|
|
||||||
|
if config.substs.get("MOZ_USING_CCACHE"):
|
||||||
|
ccache = config.substs.get("CCACHE")
|
||||||
|
ccache_start = monitor.ccache_stats(ccache)
|
||||||
|
else:
|
||||||
|
ccache_start = None
|
||||||
|
|
||||||
# Collect glean metrics
|
# Collect glean metrics
|
||||||
substs = config.substs
|
substs = config.substs
|
||||||
mozbuild_metrics = metrics.mozbuild
|
mozbuild_metrics = metrics.mozbuild
|
||||||
|
@ -1482,7 +1488,10 @@ class BuildDriver(MozbuildObject):
|
||||||
if high_finder:
|
if high_finder:
|
||||||
print(FINDER_SLOW_MESSAGE % finder_percent)
|
print(FINDER_SLOW_MESSAGE % finder_percent)
|
||||||
|
|
||||||
ccache_end = monitor.ccache_stats()
|
if config.substs.get("MOZ_USING_CCACHE"):
|
||||||
|
ccache_end = monitor.ccache_stats(ccache)
|
||||||
|
else:
|
||||||
|
ccache_end = None
|
||||||
|
|
||||||
ccache_diff = None
|
ccache_diff = None
|
||||||
if ccache_start and ccache_end:
|
if ccache_start and ccache_end:
|
||||||
|
|
Загрузка…
Ссылка в новой задаче