Merged revisions 80705 via svnmerge from

pitrou · pitrou · commit 336e54f4c732 · 2010-05-02T20:06:54.000Z
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
@@ -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
@@ -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");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -804,13 +804,13 @@ collect(int generation)`
`804`	`804`	`}`
`805`	`805`
`806`	`806`	`if (debug & DEBUG_STATS) {`
`807`		`- t1 = get_time();`
`808`	`807`	`PySys_WriteStderr("gc: collecting generation %d...\n",`
`809`	`808`	`generation);`
`810`	`809`	`PySys_WriteStderr("gc: objects in each generation:");`
`811`	`810`	`for (i = 0; i < NUM_GENERATIONS; i++)`
`812`	`811`	`PySys_WriteStderr(" %" PY_FORMAT_SIZE_T "d",`
`813`	`812`	`gc_list_size(GEN_HEAD(i)));`
	`813`	`+ t1 = get_time();`
`814`	`814`	`PySys_WriteStderr("\n");`
`815`	`815`	`}`
`816`	`816`