[3.8] bpo-37990: fix gc stats (GH-15626)

methane · web-flow · commit 97a31c7b486c · 2019-08-31T10:50:27.000+09:00
(cherry picked from commit 013e52f)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-08-31-09-22-33.bpo-37990.WDY2f-.rst b/Misc/NEWS.d/next/Core and Builtins/2019-08-31-09-22-33.bpo-37990.WDY2f-.rst
@@ -0,0 +1,2 @@
+Fix elapsed time in gc stats was not printed correctly.  This bug was
+a regression in 3.8b4.
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -1115,8 +1115,9 @@ collect(struct _gc_runtime_state *state, int generation,
     }
     if (state->debug & DEBUG_STATS) {
         double d = _PyTime_AsSecondsDouble(_PyTime_GetMonotonicClock() - t1);
-        PySys_FormatStderr(
-            "gc: done, %zd unreachable, %zd uncollectable, %.4fs elapsed\n",
+        PySys_WriteStderr(
+            "gc: done, %" PY_FORMAT_SIZE_T "d unreachable, "
+            "%" PY_FORMAT_SIZE_T "d uncollectable, %.4fs elapsed\n",
             n+m, n, d);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix elapsed time in gc stats was not printed correctly. This bug was`
	`2`	`+a regression in 3.8b4.`
Original file line number	Diff line number	Diff line change
`@@ -1115,8 +1115,9 @@ collect(struct _gc_runtime_state *state, int generation,`
`1115`	`1115`	`}`
`1116`	`1116`	`if (state->debug & DEBUG_STATS) {`
`1117`	`1117`	`double d = _PyTime_AsSecondsDouble(_PyTime_GetMonotonicClock() - t1);`
`1118`		`- PySys_FormatStderr(`
`1119`		`- "gc: done, %zd unreachable, %zd uncollectable, %.4fs elapsed\n",`
	`1118`	`+ PySys_WriteStderr(`
	`1119`	`+ "gc: done, %" PY_FORMAT_SIZE_T "d unreachable, "`
	`1120`	`+ "%" PY_FORMAT_SIZE_T "d uncollectable, %.4fs elapsed\n",`
`1120`	`1121`	`n+m, n, d);`
`1121`	`1122`	`}`
`1122`	`1123`