mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

GH-122298: Restore printing of GC stats (GH-123261)

Browse source
This commit is contained in:
Mark Shannon 2024-08-23 16:39:08 +01:00 • committed by GitHub
parent adc5190014
commit 7cd3aa42f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS.d/next/Core_and_Builtins/2024-08-23-11-26-54.gh-issue-122298.ZMyln4.rst Normal file
View file

@ -0,0 +1,3 @@
Restore printout of GC stats when ``gc.set_debug(gc.DEBUG_STATS)`` is
called. This featue was accidentally removed when implementing incremental
GC.

25
Python/gc.c
View file

@ -1300,6 +1300,7 @@ gc_collect_young(PyThreadState *tstate,
GCState *gcstate = &tstate->interp->gc; GCState *gcstate = &tstate->interp->gc;
PyGC_Head *young = &gcstate->young.head; PyGC_Head *young = &gcstate->young.head;
PyGC_Head *visited = &gcstate->old[gcstate->visited_space].head; PyGC_Head *visited = &gcstate->old[gcstate->visited_space].head;
GC_STAT_ADD(0, collections, 1);
#ifdef Py_STATS #ifdef Py_STATS
{ {
Py_ssize_t count = 0; Py_ssize_t count = 0;
@ -1428,6 +1429,7 @@ completed_cycle(GCState *gcstate)
static void static void
gc_collect_increment(PyThreadState *tstate, struct gc_collection_stats *stats) gc_collect_increment(PyThreadState *tstate, struct gc_collection_stats *stats)
{ {
GC_STAT_ADD(1, collections, 1);
GCState *gcstate = &tstate->interp->gc; GCState *gcstate = &tstate->interp->gc;
PyGC_Head *not_visited = &gcstate->old[gcstate->visited_space^1].head; PyGC_Head *not_visited = &gcstate->old[gcstate->visited_space^1].head;
PyGC_Head *visited = &gcstate->old[gcstate->visited_space].head; PyGC_Head *visited = &gcstate->old[gcstate->visited_space].head;
@ -1473,6 +1475,7 @@ static void
gc_collect_full(PyThreadState *tstate, gc_collect_full(PyThreadState *tstate,
struct gc_collection_stats *stats) struct gc_collection_stats *stats)
{ {
GC_STAT_ADD(2, collections, 1);
GCState *gcstate = &tstate->interp->gc; GCState *gcstate = &tstate->interp->gc;
validate_old(gcstate); validate_old(gcstate);
PyGC_Head *young = &gcstate->young.head; PyGC_Head *young = &gcstate->young.head;
@ -1795,6 +1798,24 @@ PyGC_IsEnabled(void)
return gcstate->enabled; return gcstate->enabled;
} }
// Show stats for objects in each generations
static void
show_stats_each_generations(GCState *gcstate)
{
char buf[100];
size_t pos = 0;
for (int i = 0; i < NUM_GENERATIONS && pos < sizeof(buf); i++) {
pos += PyOS_snprintf(buf+pos, sizeof(buf)-pos,
" %zd",
gc_list_size(GEN_HEAD(gcstate, i)));
}
PySys_FormatStderr(
"gc: objects in each generation:%s\n"
"gc: objects in permanent generation: %zd\n",
buf, gc_list_size(&gcstate->permanent_generation.head));
}
Py_ssize_t Py_ssize_t
_PyGC_Collect(PyThreadState *tstate, int generation, _PyGC_Reason reason) _PyGC_Collect(PyThreadState *tstate, int generation, _PyGC_Reason reason)
{ {
@ -1810,6 +1831,10 @@ _PyGC_Collect(PyThreadState *tstate, int generation, _PyGC_Reason reason)
if (reason != _Py_GC_REASON_SHUTDOWN) { if (reason != _Py_GC_REASON_SHUTDOWN) {
invoke_gc_callback(gcstate, "start", generation, &stats); invoke_gc_callback(gcstate, "start", generation, &stats);
} }
if (gcstate->debug & _PyGC_DEBUG_STATS) {
PySys_WriteStderr("gc: collecting generation %d...\n", generation);
show_stats_each_generations(gcstate);
}
if (PyDTrace_GC_START_ENABLED()) { if (PyDTrace_GC_START_ENABLED()) {
PyDTrace_GC_START(generation); PyDTrace_GC_START(generation);
} }