Commit f8c7c20b authored by Neil Schemenauer's avatar Neil Schemenauer

GC for generator objects.

parent 10c66927
...@@ -121,14 +121,22 @@ gen_new(PyFrameObject *f) ...@@ -121,14 +121,22 @@ gen_new(PyFrameObject *f)
} }
gen->gi_frame = f; gen->gi_frame = f;
gen->gi_running = 0; gen->gi_running = 0;
PyObject_GC_Init(gen);
return (PyObject *)gen; return (PyObject *)gen;
} }
static int
gen_traverse(genobject *gen, visitproc visit, void *arg)
{
return visit((PyObject *)gen->gi_frame, arg);
}
static void static void
gen_dealloc(genobject *gen) gen_dealloc(genobject *gen)
{ {
PyObject_GC_Fini(gen);
Py_DECREF(gen->gi_frame); Py_DECREF(gen->gi_frame);
PyObject_DEL(gen); PyObject_Del(gen);
} }
static PyObject * static PyObject *
...@@ -226,7 +234,7 @@ statichere PyTypeObject gentype = { ...@@ -226,7 +234,7 @@ statichere PyTypeObject gentype = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */ 0, /* ob_size */
"generator", /* tp_name */ "generator", /* tp_name */
sizeof(genobject), /* tp_basicsize */ sizeof(genobject) + PyGC_HEAD_SIZE, /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
/* methods */ /* methods */
(destructor)gen_dealloc, /* tp_dealloc */ (destructor)gen_dealloc, /* tp_dealloc */
...@@ -244,9 +252,9 @@ statichere PyTypeObject gentype = { ...@@ -244,9 +252,9 @@ statichere PyTypeObject gentype = {
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /* tp_flags */
0, /* tp_doc */ 0, /* tp_doc */
0, /* tp_traverse */ (traverseproc)gen_traverse, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment