From 6e20a1bdf082dc20586c291993a32b58b503744e Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 2 May 2010 19:59:47 +0000 Subject: [PATCH] Merged revisions 80704 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80704 | antoine.pitrou | 2010-05-02 21:51:14 +0200 (dim., 02 mai 2010) | 4 lines Issue #4687: Fix accuracy of garbage collection runtimes displayed with gc.DEBUG_STATS. ........ --- Misc/NEWS | 3 +++ Modules/gcmodule.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index d822584bd56..2cacaf32563 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -345,6 +345,9 @@ C-API Library ------- +- Issue #4687: Fix accuracy of garbage collection runtimes displayed with + gc.DEBUG_STATS. + - Issue #7192: webbrowser.get("firefox") now wors on Mac OS X, as does webbrowser.get("safari"). diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index 1b5cf89ba62..30587244321 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -804,13 +804,13 @@ collect(int generation) } if (debug & DEBUG_STATS) { - t1 = get_time(); PySys_WriteStderr("gc: collecting generation %d...\n", generation); PySys_WriteStderr("gc: objects in each generation:"); for (i = 0; i < NUM_GENERATIONS; i++) PySys_WriteStderr(" %" PY_FORMAT_SIZE_T "d", gc_list_size(GEN_HEAD(i))); + t1 = get_time(); PySys_WriteStderr("\n"); }