Issue #6695: Full garbage collection runs now clear the freelist of set objects.

pitrou · pitrou · commit 093ce9cd8c6e · 2011-12-16T11:24:27.000+01:00
Initial patch by Matthias Troffaes.
diff --git a/Doc/c-api/set.rst b/Doc/c-api/set.rst
@@ -157,3 +157,10 @@ subtypes but not for instances of :class:`frozenset` or its subtypes.
 .. c:function:: int PySet_Clear(PyObject *set)
 
    Empty an existing set of all elements.
+
+
+.. c:function:: int PySet_ClearFreeList()
+
+   Clear the free list. Return the total number of freed items.
+
+   .. versionadded:: 3.3
diff --git a/Include/setobject.h b/Include/setobject.h
@@ -99,6 +99,8 @@ PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key,
 PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set);
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);
+
+PyAPI_FUNC(int) PySet_ClearFreeList(void);
 #endif
 
 #ifdef __cplusplus
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #6695: Full garbage collection runs now clear the freelist of set
+  objects.  Initial patch by Matthias Troffaes.
+
 - Fix OSError.__init__ and OSError.__new__ so that each of them can be
   overriden and take additional arguments (followup to issue #12555).
 
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -764,6 +764,7 @@ clear_freelists(void)
     (void)PyFloat_ClearFreeList();
     (void)PyList_ClearFreeList();
     (void)PyDict_ClearFreeList();
+    (void)PySet_ClearFreeList();
 }
 
 static double
diff --git a/Objects/setobject.c b/Objects/setobject.c
@@ -1068,16 +1068,24 @@ frozenset_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     return emptyfrozenset;
 }
 
-void
-PySet_Fini(void)
+int
+PySet_ClearFreeList(void)
 {
+    int freelist_size = numfree;
     PySetObject *so;
 
     while (numfree) {
         numfree--;
         so = free_list[numfree];
         PyObject_GC_Del(so);
     }
+    return freelist_size;
+}
+
+void
+PySet_Fini(void)
+{
+    PySet_ClearFreeList();
     Py_CLEAR(dummy);
     Py_CLEAR(emptyfrozenset);
 }

Original file line number	Diff line number	Diff line change
`@@ -764,6 +764,7 @@ clear_freelists(void)`
`764`	`764`	`(void)PyFloat_ClearFreeList();`
`765`	`765`	`(void)PyList_ClearFreeList();`
`766`	`766`	`(void)PyDict_ClearFreeList();`
	`767`	`+ (void)PySet_ClearFreeList();`
`767`	`768`	`}`
`768`	`769`
`769`	`770`	`static double`