Skip to content

bpo-1635741: Port gc module to multiphase initialization #23377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 3 commits into from
Nov 19, 2020
Merged

bpo-1635741: Port gc module to multiphase initialization #23377

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
271e017
bpo-1635741: Port gc module to multiphase initialization
tiran Nov 18, 2020
331d676
Fix reference leak
tiran Nov 19, 2020
7ad98d9
Create gc callbacks in _PyGC_init()
tiran Nov 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
bpo-1635741: Port gc module to multiphase initialization 
Signed-off-by: Christian Heimes <christian@python.org>
  • Loading branch information
@tiran
tiran committed Nov 19, 2020
commit 271e017401075d1e4faad287daf863ac384ce849
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/C API/2020-11-18-20-33-35.bpo-1635741.B4ztSk.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Port :mod:`gc` extension module to multiphase initialization (:pep:`489`)
68 changes: 32 additions & 36 deletions Modules/gcmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1992,59 +1992,55 @@ static PyMethodDef GcMethods[] = {
{NULL, NULL} /* Sentinel */
};

static struct PyModuleDef gcmodule = {
PyModuleDef_HEAD_INIT,
"gc", /* m_name */
gc__doc__, /* m_doc */
-1, /* m_size */
GcMethods, /* m_methods */
NULL, /* m_reload */
NULL, /* m_traverse */
NULL, /* m_clear */
NULL /* m_free */
};

PyMODINIT_FUNC
PyInit_gc(void)
static int
gcmodule_exec(PyObject *module)
{
GCState *gcstate = get_gc_state();

PyObject *m = PyModule_Create(&gcmodule);

if (m == NULL) {
return NULL;
}

gcstate->garbage = PyList_New(0);
if (gcstate->garbage == NULL) {
gcstate->garbage = PyList_New(0);
if (gcstate->garbage == NULL) {
return NULL;
}
return -1;
}
Py_INCREF(gcstate->garbage);
if (PyModule_AddObject(m, "garbage", gcstate->garbage) < 0) {
return NULL;
if (PyModule_AddObjectRef(module, "garbage", gcstate->garbage) < 0) {
return -1;
}

gcstate->callbacks = PyList_New(0);
if (gcstate->callbacks == NULL) {
gcstate->callbacks = PyList_New(0);
if (gcstate->callbacks == NULL) {
return NULL;
}
return -1;
}
Py_INCREF(gcstate->callbacks);
if (PyModule_AddObject(m, "callbacks", gcstate->callbacks) < 0) {
return NULL;
if (PyModule_AddObjectRef(module, "callbacks", gcstate->callbacks) < 0) {
return -1;
}

#define ADD_INT(NAME) if (PyModule_AddIntConstant(m, #NAME, NAME) < 0) { return NULL; }
#define ADD_INT(NAME) if (PyModule_AddIntConstant(module, #NAME, NAME) < 0) { return -1; }
ADD_INT(DEBUG_STATS);
ADD_INT(DEBUG_COLLECTABLE);
ADD_INT(DEBUG_UNCOLLECTABLE);
ADD_INT(DEBUG_SAVEALL);
ADD_INT(DEBUG_LEAK);
#undef ADD_INT
return m;
return 0;
}

static PyModuleDef_Slot gcmodule_slots[] = {
{Py_mod_exec, gcmodule_exec},
{0, NULL}
};

static struct PyModuleDef gcmodule = {
PyModuleDef_HEAD_INIT,
.m_name = "gc",
.m_doc = gc__doc__,
.m_size = 0, /* special case, state is part of interpreter state */
Comment thread
tiran marked this conversation as resolved.
Outdated
.m_methods = GcMethods,
.m_slots = gcmodule_slots
};

PyMODINIT_FUNC
PyInit_gc(void)
{
return PyModuleDef_Init(&gcmodule);
}

/* Public API to invoke gc.collect() from C */
Expand Down