Bug 1782344 - Avoid the duplication of stats_zeroed in CCacheStats se…

…rialization. r=firefox-build-system-reviewers,ahochheiden Differential Revision: https://phabricator.services.mozilla.com/D166633
iaxat · Jan 13, 2023 · 82477fe · 82477fe
1 parent b4de983
commit 82477fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py
@@ -842,8 +842,7 @@ class CCacheStats(object):
     STATS_KEYS = [
         # (key, description)
         # Refer to stats.c in ccache project for all the descriptions.
-        ("stats_zeroed", "stats zero time"),  # Old name prior to ccache 3.4
-        ("stats_zeroed", "stats zeroed"),
+        ("stats_zeroed", ("stats zeroed", "stats zero time")),
         ("stats_updated", "stats updated"),
         ("cache_hit_direct", "cache hit (direct)"),
         ("cache_hit_preprocessed", "cache hit (preprocessed)"),
@@ -1032,6 +1031,10 @@ def _parse_line(self, line):
 
     @staticmethod
     def _strip_prefix(line, prefix):
+        if isinstance(prefix, tuple):
+            for p in prefix:
+                line = CCacheStats._strip_prefix(line, p)
+            return line
         return line[len(prefix) :].strip() if line.startswith(prefix) else line
 
     @staticmethod
@@ -1121,6 +1124,9 @@ def __str__(self):
             else:
                 value = "%8u" % value
 
+            if isinstance(stat_description, tuple):
+                stat_description = stat_description[0]
+
             lines.append("%s%s" % (stat_description.ljust(LEFT_ALIGN), value))
 
         return "\n".join(lines)

diff --git a/python/mozbuild/mozbuild/test/controller/test_ccachestats.py b/python/mozbuild/mozbuild/test/controller/test_ccachestats.py
@@ -632,7 +632,6 @@ def test_stats_version34(self):
         stat8 = CCacheStats(self.STAT8)
         self.assertEqual(
             str(stat8),
-            f"stats zero time                   {int(TIMESTAMP)}\n"
             f"stats zeroed                      {int(TIMESTAMP)}\n"
             "cache hit (direct)                     571\n"
             "cache hit (preprocessed)              1203\n"
@@ -656,7 +655,6 @@ def test_stats_version35(self):
         stat9 = CCacheStats(self.STAT9)
         self.assertEqual(
             str(stat9),
-            f"stats zero time                   {int(TIMESTAMP)}\n"
             f"stats zeroed                      {int(TIMESTAMP)}\n"
             f"stats updated                     {int(TIMESTAMP2)}\n"
             "cache hit (direct)                   80147\n"