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

diff --git a/Misc/NEWS b/Misc/NEWS
index 54145128c2e5c6f60eefba08f90c37f8c05b77eb..b15d03c90ef21f1f9c54cfd304e1d734ae38fc58 100644 (file)
--- 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 1b5cf89ba6256c357ab7c3685839308c8df21eba..305872443214a5ca8b09e8a0af0d92513ace5fc3 100644 (file)
--- 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");
        }