diff options
author | Stefan Behnel <stefan_ml@behnel.de> | 2021-04-20 17:19:43 +0200 |
---|---|---|
committer | Stefan Behnel <stefan_ml@behnel.de> | 2021-04-20 17:19:43 +0200 |
commit | a29b2a6b3598af1e893468d052d57d983b562d5e (patch) | |
tree | 687e5e49174af574b5a57c934072e1d7424ce07d | |
parent | 3048be77631d91ddf9210c34f8de436ab70d7c04 (diff) | |
download | cython-a29b2a6b3598af1e893468d052d57d983b562d5e.tar.gz |
Revert "Efficiency improvements for enabling/disabling gc in __Pyx_PyType_Ready()."
This change introduced Python object statics, which has a negative impact on multiple interpreter support etc.
This reverts commit b68f2585ceec37e0be245122a0fb6328f5145e8d.
-rw-r--r-- | Cython/Utility/ExtensionTypes.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/Cython/Utility/ExtensionTypes.c b/Cython/Utility/ExtensionTypes.c index 29fc3440d..2d8f2dff1 100644 --- a/Cython/Utility/ExtensionTypes.c +++ b/Cython/Utility/ExtensionTypes.c @@ -8,7 +8,6 @@ static int __Pyx_PyType_Ready(PyTypeObject *t);/*proto*/ #endif /////////////// PyType_Ready /////////////// -//@requires: ObjectHandling.c::PyObjectCallNoArg #if CYTHON_COMPILING_IN_CPYTHON || CYTHON_COMPILING_IN_LIMITED_API // Wrapper around PyType_Ready() with some runtime checks and fixes @@ -74,35 +73,24 @@ static int __Pyx_PyType_Ready(PyTypeObject *t) { // For details, see https://github.com/cython/cython/issues/3603 PyObject *ret, *py_status; int gc_was_enabled; - static PyObject *gc = NULL; - static PyObject *gc_isenabled = NULL, *gc_enable = NULL, *gc_disable = NULL; - if (unlikely(!gc)) { - gc = PyImport_Import(PYUNICODE("gc")); - if (unlikely(!gc)) return -1; - gc_isenabled = PyObject_GetAttr(gc, PYUNICODE("isenabled")); - gc_enable = PyObject_GetAttr(gc, PYUNICODE("enable")); - gc_disable = PyObject_GetAttr(gc, PYUNICODE("disable")); - if (unlikely(!gc_isenabled || !gc_enable || !gc_disable)) { - Py_XDECREF(gc_isenabled); gc_isenabled = NULL; - Py_XDECREF(gc_enable); gc_enable = NULL; - Py_XDECREF(gc_disable); gc_disable = NULL; - Py_XDECREF(gc); gc = NULL; - return -1; - } - } - py_status = __Pyx_PyObject_CallNoArg(gc_isenabled); + PyObject *gc = PyImport_Import(PYUNICODE("gc")); + if (unlikely(!gc)) return -1; + py_status = PyObject_CallMethodObjArgs(gc, PYUNICODE("isenabled"), NULL); if (unlikely(!py_status)) { + Py_DECREF(gc); return -1; } gc_was_enabled = __Pyx_PyObject_IsTrue(py_status); Py_DECREF(py_status); if (gc_was_enabled > 0) { - ret = __Pyx_PyObject_CallNoArg(gc_disable); + ret = PyObject_CallMethodObjArgs(gc, PYUNICODE("disable"), NULL); if (unlikely(!ret)) { + Py_DECREF(gc); return -1; } Py_DECREF(ret); } else if (unlikely(gc_was_enabled == -1)) { + Py_DECREF(gc); return -1; } @@ -124,7 +112,7 @@ static int __Pyx_PyType_Ready(PyTypeObject *t) { if (gc_was_enabled) { PyObject *t, *v, *tb; PyErr_Fetch(&t, &v, &tb); - ret = __Pyx_PyObject_CallNoArg(gc_enable); + ret = PyObject_CallMethodObjArgs(gc, PYUNICODE("enable"), NULL); if (likely(ret || r == -1)) { Py_XDECREF(ret); // do not overwrite exceptions raised by PyType_Ready() above @@ -137,6 +125,7 @@ static int __Pyx_PyType_Ready(PyTypeObject *t) { r = -1; } } + Py_DECREF(gc); } #endif |