Reset the GC state when finalize

amos402 · amos402 · commit 3fb76b5fafc1 · 2018-06-04T04:33:41.000+08:00
It's save for initialize python again, be it will cause a larger memory leak.
diff --git a/Include/object.h b/Include/object.h
@@ -759,6 +759,7 @@ PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
 PyAPI_FUNC(void) _Py_PrintReferences(FILE *);
 PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *);
 PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force);
+PyAPI_FUNC(void) _Py_ResetRefChain(void);
 
 #else
 /* Without Py_TRACE_REFS, there's little enough to do that we expand code
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
@@ -104,6 +104,7 @@ PyAPI_FUNC(void) PyFloat_Fini(void);
 PyAPI_FUNC(void) PyOS_FiniInterrupts(void);
 PyAPI_FUNC(void) _PyGC_DumpShutdownStats(void);
 PyAPI_FUNC(void) _PyGC_Fini(void);
+PyAPI_FUNC(void) _PyGC_Clear(void);
 PyAPI_FUNC(void) PySlice_Fini(void);
 PyAPI_FUNC(void) _PyType_Fini(void);
 PyAPI_FUNC(void) _PyRandom_Fini(void);
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -1671,6 +1671,16 @@ _PyGC_Fini(void)
     Py_CLEAR(callbacks);
 }
 
+void
+_PyGC_Clear(void)
+{
+    for (int i = 0; i < NUM_GENERATIONS; ++i) {
+        PyGC_Head *head = GEN_HEAD(i);
+        head->gc.gc_next = head;
+        head->gc.gc_prev = head;
+    }
+}
+
 /* for debugging */
 void
 _PyGC_Dump(PyGC_Head *g)
@@ -1798,3 +1808,22 @@ PyObject_GC_Del(void *op)
     }
     PyObject_FREE(g);
 }
+
+void gc_init_gneration()
+{
+    for (int i = 0; i < NUM_GENERATIONS; i++) {
+        PyGC_Head* head = GEN_HEAD(i);
+        if (head->gc.gc_next != head) {
+            PyGC_Head* dummy_head = head;
+            Py_ssize_t len = 0;
+            do {
+                dummy_head = dummy_head->gc.gc_next;
+                ++len;
+            } while (dummy_head != head);
+            printf("gen[%d]garbage len :%"PY_FORMAT_SIZE_T"d\n", i, len);
+        }
+        //head->gc.gc_next = head;
+        //head->gc.gc_prev = head;
+    }
+}
+
diff --git a/Objects/object.c b/Objects/object.c
@@ -85,6 +85,13 @@ _Py_AddToAllObjects(PyObject *op, int force)
         refchain._ob_next = op;
     }
 }
+
+void
+_Py_ResetRefChain(void)
+{
+    refchain._ob_next = &refchain;
+    refchain._ob_prev = &refchain;
+}
 #endif  /* Py_TRACE_REFS */
 
 #ifdef COUNT_ALLOCS
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -735,6 +735,12 @@ Py_FinalizeEx(void)
     }
 #endif
 
+    _PyGC_Clear();
+
+#ifdef Py_TRACE_REFS
+    _Py_ResetRefChain();
+#endif
+
     call_ll_exitfuncs();
     return status;
 }

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,13 @@ _Py_AddToAllObjects(PyObject *op, int force)`
`85`	`85`	`refchain._ob_next = op;`
`86`	`86`	`}`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+void`
	`90`	`+_Py_ResetRefChain(void)`
	`91`	`+{`
	`92`	`+ refchain._ob_next = &refchain;`
	`93`	`+ refchain._ob_prev = &refchain;`
	`94`	`+}`
`88`	`95`	`#endif /* Py_TRACE_REFS */`
`89`	`96`
`90`	`97`	`#ifdef COUNT_ALLOCS`
Original file line number	Diff line number	Diff line change
`@@ -735,6 +735,12 @@ Py_FinalizeEx(void)`
`735`	`735`	`}`
`736`	`736`	`#endif`
`737`	`737`
	`738`	`+ _PyGC_Clear();`
	`739`	`+`
	`740`	`+#ifdef Py_TRACE_REFS`
	`741`	`+ _Py_ResetRefChain();`
	`742`	`+#endif`
	`743`	`+`
`738`	`744`	`call_ll_exitfuncs();`
`739`	`745`	`return status;`
`740`	`746`	`}`