|
@@ -1,12 +1,12 @@
|
|
# HG changeset patch
|
|
# HG changeset patch
|
|
# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
-# Date 1697543377 0
|
|
|
|
|
|
+# Date 1697707268 0
|
|
Bug 9999999 - Revert to old poll_interval for developer builds.
|
|
Bug 9999999 - Revert to old poll_interval for developer builds.
|
|
|
|
|
|
diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
|
|
diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
|
|
--- a/python/mozbuild/mozbuild/controller/building.py
|
|
--- a/python/mozbuild/mozbuild/controller/building.py
|
|
+++ b/python/mozbuild/mozbuild/controller/building.py
|
|
+++ b/python/mozbuild/mozbuild/controller/building.py
|
|
-@@ -182,17 +182,20 @@ class BuildMonitor(MozbuildObject):
|
|
|
|
|
|
+@@ -183,20 +183,26 @@ class BuildMonitor(MozbuildObject):
|
|
"""Monitors the output of the build."""
|
|
"""Monitors the output of the build."""
|
|
|
|
|
|
def init(self, warnings_path, terminal):
|
|
def init(self, warnings_path, terminal):
|
|
@@ -15,11 +15,20 @@ diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/m
|
|
warnings_path is a path of a warnings database to use.
|
|
warnings_path is a path of a warnings database to use.
|
|
"""
|
|
"""
|
|
self._warnings_path = warnings_path
|
|
self._warnings_path = warnings_path
|
|
-- self.resources = SystemResourceMonitor(poll_interval=0.1)
|
|
|
|
|
|
+- self.resources = SystemResourceMonitor(
|
|
|
|
+- poll_interval=0.1,
|
|
|
|
+- metadata={"CPUName": get_cpu_brand()},
|
|
|
|
+- )
|
|
+ if "MOZ_AUTOMATION" in os.environ:
|
|
+ if "MOZ_AUTOMATION" in os.environ:
|
|
-+ self.resources = SystemResourceMonitor(poll_interval=0.1)
|
|
|
|
|
|
++ self.resources = SystemResourceMonitor(
|
|
|
|
++ poll_interval=0.1,
|
|
|
|
++ metadata={"CPUName": get_cpu_brand()},
|
|
|
|
++ )
|
|
|
|
++ self.resources = SystemResourceMonitor(
|
|
|
|
++ poll_interval=1.0,
|
|
|
|
++ metadata={"CPUName": get_cpu_brand()},
|
|
|
|
++ )
|
|
+ else:
|
|
+ else:
|
|
-+ self.resources = SystemResourceMonitor(poll_interval=1.0)
|
|
|
|
self._resources_started = False
|
|
self._resources_started = False
|
|
|
|
|
|
self.tiers = TierStatus(self.resources)
|
|
self.tiers = TierStatus(self.resources)
|