[Python-checkins] r80706 - in python/branches/release26-maint: Misc/NEWS Modules/gcmodule.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun May  2 21:59:51 2010
New Revision: 80706

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/gcmodule.c

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun May  2 21:59:51 2010
@@ -33,6 +33,9 @@
 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".

Modified: python/branches/release26-maint/Modules/gcmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/gcmodule.c	(original)
+++ python/branches/release26-maint/Modules/gcmodule.c	Sun May  2 21:59:51 2010
@@ -780,13 +780,13 @@
 	}
 
 	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");
 	}