[Python-checkins] gh-104028: Reduce object creation while calling callback function from gc (gh-104030)
corona10
webhook-mailer at python.org
Mon May 1 10:03:31 EDT 2023
https://github.com/python/cpython/commit/e1476942525ae847875dab55541bef4a8a99dd3d
commit: e1476942525ae847875dab55541bef4a8a99dd3d
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2023-05-01T14:03:24Z
summary:
gh-104028: Reduce object creation while calling callback function from gc (gh-104030)
files:
A Misc/NEWS.d/next/Core and Builtins/2023-05-01-14-10-38.gh-issue-104028.dxfh13.rst
M Modules/gcmodule.c
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-05-01-14-10-38.gh-issue-104028.dxfh13.rst b/Misc/NEWS.d/next/Core and Builtins/2023-05-01-14-10-38.gh-issue-104028.dxfh13.rst
new file mode 100644
index 000000000000..9c35ea88499d
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-05-01-14-10-38.gh-issue-104028.dxfh13.rst
@@ -0,0 +1,2 @@
+Reduce object creation while calling callback function from gc.
+Patch by Dong-hee Na.
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 966c1e615502..3fd5f4cd70e8 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -1388,10 +1388,19 @@ invoke_gc_callback(PyThreadState *tstate, const char *phase,
return;
}
}
+
+ PyObject *phase_obj = PyUnicode_FromString(phase);
+ if (phase_obj == NULL) {
+ Py_XDECREF(info);
+ PyErr_WriteUnraisable(NULL);
+ return;
+ }
+
+ PyObject *stack[] = {phase_obj, info};
for (Py_ssize_t i=0; i<PyList_GET_SIZE(gcstate->callbacks); i++) {
PyObject *r, *cb = PyList_GET_ITEM(gcstate->callbacks, i);
Py_INCREF(cb); /* make sure cb doesn't go away */
- r = PyObject_CallFunction(cb, "sO", phase, info);
+ r = PyObject_Vectorcall(cb, stack, 2, NULL);
if (r == NULL) {
PyErr_WriteUnraisable(cb);
}
@@ -1400,6 +1409,7 @@ invoke_gc_callback(PyThreadState *tstate, const char *phase,
}
Py_DECREF(cb);
}
+ Py_DECREF(phase_obj);
Py_XDECREF(info);
assert(!_PyErr_Occurred(tstate));
}
More information about the Python-checkins
mailing list