mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Revert "bpo-31356: Add context manager to temporarily disable GC GH-5495

Browse source 
This reverts commit 72a0d218dc.

The reverted commit had a few issues so it was unanimously decided
to undo it. See the bpo issue for details.
This commit is contained in:
Yury Selivanov 2018-02-02 09:31:06 -05:00 • committed by GitHub
parent aa0735f597
commit 383b32fe10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

106
Modules/gcmodule.c
View file

@ -1067,10 +1067,6 @@ static PyObject *
gc_enable_impl(PyObject *module)
/*[clinic end generated code: output=45a427e9dce9155c input=81ac4940ca579707]*/
{
if(_PyRuntime.gc.disabled_threads){
PyErr_WarnEx(PyExc_RuntimeWarning, "Garbage collector enabled while another "
"thread is inside gc.ensure_enabled",1);
}
_PyRuntime.gc.enabled = 1;
Py_RETURN_NONE;
}
@ -1512,102 +1508,6 @@ static PyMethodDef GcMethods[] = {
{NULL, NULL} /* Sentinel */
};
typedef struct {
PyObject_HEAD
int previous_gc_state;
} ensure_disabled_object;
static void
ensure_disabled_object_dealloc(ensure_disabled_object *m_obj)
{
Py_TYPE(m_obj)->tp_free((PyObject*)m_obj);
}
static PyObject *
ensure_disabled__enter__method(ensure_disabled_object *self, PyObject *args)
{
PyGILState_STATE gstate = PyGILState_Ensure();
++_PyRuntime.gc.disabled_threads;
self->previous_gc_state = _PyRuntime.gc.enabled;
gc_disable_impl(NULL);
PyGILState_Release(gstate);
Py_RETURN_NONE;
}
static PyObject *
ensure_disabled__exit__method(ensure_disabled_object *self, PyObject *args)
{
PyGILState_STATE gstate = PyGILState_Ensure();
--_PyRuntime.gc.disabled_threads;
if(self->previous_gc_state){
gc_enable_impl(NULL);
}else{
gc_disable_impl(NULL);
}
PyGILState_Release(gstate);
Py_RETURN_NONE;
}
static struct PyMethodDef ensure_disabled_object_methods[] = {
{"__enter__", (PyCFunction) ensure_disabled__enter__method, METH_NOARGS},
{"__exit__", (PyCFunction) ensure_disabled__exit__method, METH_VARARGS},
{NULL, NULL} /* sentinel */
};
static PyObject *
new_disabled_obj(PyTypeObject *type, PyObject *args, PyObject *kwdict){
ensure_disabled_object *self;
self = (ensure_disabled_object *)type->tp_alloc(type, 0);
return (PyObject *) self;
};
static PyTypeObject gc_ensure_disabled_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"gc.ensure_disabled", /* tp_name */
sizeof(ensure_disabled_object), /* tp_size */
0, /* tp_itemsize */
/* methods */
(destructor) ensure_disabled_object_dealloc,/* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_reserved */
0, /* tp_repr */
0, /* tp_as_number */
0, /*tp_as_sequence*/
0, /*tp_as_mapping*/
0, /*tp_hash*/
0, /*tp_call*/
0, /*tp_str*/
PyObject_GenericGetAttr, /*tp_getattro*/
0, /*tp_setattro*/
0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
0, /*tp_doc*/
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
ensure_disabled_object_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
0, /* tp_init */
PyType_GenericAlloc, /* tp_alloc */
new_disabled_obj, /* tp_new */
PyObject_Del, /* tp_free */
};
static struct PyModuleDef gcmodule = {
PyModuleDef_HEAD_INIT,
"gc", /* m_name */
@ -1648,12 +1548,6 @@ PyInit_gc(void)
if (PyModule_AddObject(m, "callbacks", _PyRuntime.gc.callbacks) < 0)
return NULL;
if (PyType_Ready(&gc_ensure_disabled_type) < 0)
return NULL;
if (PyModule_AddObject(m, "ensure_disabled", (PyObject*) &gc_ensure_disabled_type) < 0)
return NULL;
#define ADD_INT(NAME) if (PyModule_AddIntConstant(m, #NAME, NAME) < 0) return NULL
ADD_INT(DEBUG_STATS);
ADD_INT(DEBUG_COLLECTABLE);