1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to avoid creating reference cycles involving generators. Only keep a

Browse Source 
reference to f_back when its really needed.  Do a little whitespace
normalization as well.  This whole file is a big war between tabs and spaces
but now is probably not the time to reindent everything.
This commit is contained in:
Neil Schemenauer 2001-06-21 02:41:10 +00:00
parent 2942131dac
commit 2b13ce8317
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Python/ceval.c
View File

@ -138,6 +138,7 @@ gen_dealloc(genobject *gen)
static PyObject * static PyObject *
gen_iternext(genobject *gen) gen_iternext(genobject *gen)
{ {
PyThreadState *tstate = PyThreadState_GET();
PyFrameObject *f = gen->frame; PyFrameObject *f = gen->frame;
PyObject *result; PyObject *result;
@ -149,15 +150,24 @@ gen_iternext(genobject *gen)
if (f->f_stackbottom == NULL) { if (f->f_stackbottom == NULL) {
return NULL; return NULL;
} }
gen->running = 1;
/* Generators always return to their most recent caller, not
* necessarily their creator. */
Py_INCREF(tstate->frame);
assert(f->f_back == NULL);
f->f_back = tstate->frame;
gen->running = 1;
result = eval_frame(f); result = eval_frame(f);
gen->running = 0; gen->running = 0;
/* The connection between this frame and its parent is over now, so
must NULL out f_back lest it get decref'ed when gen dies (note /* Don't keep the reference to f_back any longer than necessary. It
that eval_frame sets f->f_back without bumping its refcount: we * may keep a chain of frames alive or it could create a reference
never had a fully legit reference to it). */ * cycle. */
Py_DECREF(f->f_back);
f->f_back = NULL; f->f_back = NULL;
return result;
return result;
} }
static PyObject * static PyObject *
@ -168,12 +178,12 @@ gen_next(genobject *gen, PyObject *args)
if (!PyArg_ParseTuple(args, ":next")) if (!PyArg_ParseTuple(args, ":next"))
return NULL; return NULL;
result = gen_iternext(gen); result = gen_iternext(gen);
if (result == NULL && !PyErr_Occurred()) { if (result == NULL && !PyErr_Occurred()) {
PyErr_SetObject(PyExc_StopIteration, Py_None); PyErr_SetObject(PyExc_StopIteration, Py_None);
return NULL; return NULL;
} }
return result; return result;
} }
@ -568,9 +578,7 @@ eval_frame(PyFrameObject *f)
return NULL; return NULL;
} }
f->f_back = tstate->frame;
tstate->frame = f; tstate->frame = f;
co = f->f_code; co = f->f_code;
fastlocals = f->f_localsplus; fastlocals = f->f_localsplus;
freevars = f->f_localsplus + f->f_nlocals; freevars = f->f_localsplus + f->f_nlocals;
@ -2482,8 +2490,13 @@ eval_code2(PyCodeObject *co, PyObject *globals, PyObject *locals,
} }
if (co->co_flags & CO_GENERATOR) { if (co->co_flags & CO_GENERATOR) {
/* create a new generator that owns the ready to run frame /* Don't need to keep the reference to f_back, it will be set
* and return that as the value */ * when the generator is resumed. */
Py_DECREF(f->f_back);
f->f_back = NULL;
/* Create a new generator that owns the ready to run frame
* and return that as the value. */
return gen_new(f); return gen_new(f);
} }