Fix totals for refcounts

python · Sep 20, 2024 · e179c31 · e179c31
1 parent 76f1e48
commit e179c31
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Python/specialize.c b/Python/specialize.c
@@ -205,10 +205,10 @@ print_object_stats(FILE *out, ObjectStats *stats)
  fprintf(out, "Object allocations over 4 kbytes: %" PRIu64 "\n", stats->allocations_big);
  fprintf(out, "Object frees: %" PRIu64 "\n", stats->frees);
  fprintf(out, "Object inline values: %" PRIu64 "\n", stats->inline_values);
- fprintf(out, "Object interpreter (mortal) increfs: %" PRIu64 "\n", stats->interpreter_increfs);
- fprintf(out, "Object interpreter (mortal) decrefs: %" PRIu64 "\n", stats->interpreter_decrefs);
- fprintf(out, "Object (mortal) increfs: %" PRIu64 "\n", stats->increfs);
- fprintf(out, "Object (mortal) decrefs: %" PRIu64 "\n", stats->decrefs);
+ fprintf(out, "Object interpreter mortal increfs: %" PRIu64 "\n", stats->interpreter_increfs);
+ fprintf(out, "Object interpreter mortal decrefs: %" PRIu64 "\n", stats->interpreter_decrefs);
+ fprintf(out, "Object mortal increfs: %" PRIu64 "\n", stats->increfs);
+ fprintf(out, "Object mortal decrefs: %" PRIu64 "\n", stats->decrefs);
  fprintf(out, "Object interpreter immortal increfs: %" PRIu64 "\n", stats->interpreter_immortal_increfs);
  fprintf(out, "Object interpreter immortal decrefs: %" PRIu64 "\n", stats->interpreter_immortal_decrefs);
  fprintf(out, "Object immortal increfs: %" PRIu64 "\n", stats->immortal_increfs);

diff --git a/Tools/scripts/summarize_stats.py b/Tools/scripts/summarize_stats.py
@@ -398,12 +398,18 @@ def get_object_stats(self) -> dict[str, tuple[int, int]]:
  total_allocations = self._data.get("Object allocations", 0) + self._data.get(
  "Object allocations from freelist", 0
  )
- total_increfs = self._data.get(
- "Object interpreter increfs", 0
- ) + self._data.get("Object increfs", 0)
- total_decrefs = self._data.get(
- "Object interpreter decrefs", 0
- ) + self._data.get("Object decrefs", 0)
+ total_increfs = (
+ self._data.get("Object interpreter mortal increfs", 0) +
+ self._data.get("Object mortal increfs", 0) +
+ self._data.get("Object interpreter immortal increfs", 0) +
+ self._data.get("Object immortal increfs", 0)
+ )
+ total_decrefs = (
+ self._data.get("Object interpreter mortal decrefs", 0) +
+ self._data.get("Object mortal decrefs", 0) +
+ self._data.get("Object interpreter immortal decrefs", 0) +
+ self._data.get("Object immortal decrefs", 0)
+ )
 
  result = {}
  for key, value in self._data.items():