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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 79a18a8a2c2e4549602abe93d4e2eef59cc3572f..f943618c69b4c087cceda04382f5ef5703cbdb7b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4687: Fix accuracy of garbage collection runtimes displayed with
+  gc.DEBUG_STATS.
+
 - Issue #8577: distutils.sysconfig.get_python_inc() now makes a difference 
   between the build dir and the source dir when looking for "python.h" or
   "Include".

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index c7426a58cedec80c758af80e8fada290f41a0580..49cf7163f3b02074494da7c991d21d829dcfa0fa 100644 (file)
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -780,13 +780,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");
        }