From 336e54f4c73299e0d716842f0accce2f5560304b Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 2 May 2010 20:06:54 +0000 Subject: Merged revisions 80705 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80705 | antoine.pitrou | 2010-05-02 21:59:47 +0200 (dim., 02 mai 2010) | 10 lines 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 5414512..b15d03c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,9 @@ Core and Builtins Library ------- +- Issue #4687: Fix accuracy of garbage collection runtimes displayed with + gc.DEBUG_STATS. + - Issue #8464: tarfile no longer creates files with execute permissions set when mode="w|" is used. diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index 1b5cf89..3058724 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"); } -- cgit v0.12