Revert duration because we need total duration in tests

Author: sergey-miryanov

Include/internal/pycore_interp_structs.h

@@ -203,6 +203,9 @@ struct gc_generation_stats {
 
     Py_ssize_t objects_transitively_reachable;
     Py_ssize_t objects_not_transitively_reachable;
+
+    // Total duration of the collection in seconds:
+    double duration;
 };
 
 #define GC_YOUNG_STATS_SIZE 11

Modules/gcmodule.c

@@ -342,7 +342,6 @@ gc_get_stats_impl(PyObject *module)
 /*[clinic end generated code: output=a8ab1d8a5d26f3ab input=1ef4ed9d17b1a470]*/
 {
     int i;
-    double duration;
     struct gc_generation_stats stats[NUM_GENERATIONS], *st;
 
     /* To get consistent values despite allocations while constructing
@@ -359,13 +358,12 @@ gc_get_stats_impl(PyObject *module)
     for (i = 0; i < NUM_GENERATIONS; i++) {
         PyObject *dict;
         st = &stats[i];
-        duration = PyTime_AsSecondsDouble(st->ts_stop - st->ts_start);
         dict = Py_BuildValue("{snsnsnsnsd}",
                              "collections", st->collections,
                              "collected", st->collected,
                              "uncollectable", st->uncollectable,
                              "candidates", st->candidates,
-                             "duration", duration
+                             "duration", st->duration
                             );
         if (dict == NULL)
             goto error;

Python/gc.c

@@ -1447,6 +1447,8 @@ add_stats(GCState *gcstate, int gen, struct gc_generation_stats *stats)
 
     cur_stats->objects_transitively_reachable += stats->objects_transitively_reachable;
     cur_stats->objects_not_transitively_reachable += stats->objects_not_transitively_reachable;
+
+    cur_stats->duration += stats->duration;
 }
 
 static void
@@ -1929,13 +1931,12 @@ do_gc_callback(GCState *gcstate, const char *phase,
     assert(PyList_CheckExact(gcstate->callbacks));
     PyObject *info = NULL;
     if (PyList_GET_SIZE(gcstate->callbacks) != 0) {
-        double duration = PyTime_AsSecondsDouble(stats->ts_stop - stats->ts_start);
         info = Py_BuildValue("{sisnsnsnsd}",
             "generation", generation,
             "collected", stats->collected,
             "uncollectable", stats->uncollectable,
             "candidates", stats->candidates,
-            "duration", duration);
+            "duration", stats->duration);
         if (info == NULL) {
             PyErr_FormatUnraisable("Exception ignored while invoking gc callbacks");
             return;
@@ -2191,6 +2192,7 @@ _PyGC_Collect(PyThreadState *tstate, int generation, _PyGC_Reason reason)
             Py_UNREACHABLE();
     }
     (void)PyTime_PerfCounterRaw(&stats.ts_stop);
+    stats.duration = PyTime_AsSecondsDouble(stats.ts_stop - stats.ts_start);
     add_stats(gcstate, generation, &stats);
     if (PyDTrace_GC_DONE_ENABLED()) {
         PyDTrace_GC_DONE(stats.uncollectable + stats.collected);
@@ -2213,10 +2215,9 @@ _PyGC_Collect(PyThreadState *tstate, int generation, _PyGC_Reason reason)
     _Py_atomic_store_int(&gcstate->collecting, 0);
 
     if (gcstate->debug & _PyGC_DEBUG_STATS) {
-        double duration = PyTime_AsSecondsDouble(stats.ts_stop - stats.ts_start);
         PySys_WriteStderr(
             "gc: done, %zd unreachable, %zd uncollectable, %.4fs elapsed\n",
-            stats.collected + stats.uncollectable, stats.uncollectable, duration
+            stats.collected + stats.uncollectable, stats.uncollectable, stats.duration
         );
     }