Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 41c70e6

Browse files
brandtbucherbrandtbucher
committed
Clean up how we access/walk the frame stack
1 parent 04b77ac commit 41c70e6

9 files changed

Lines changed: 23 additions & 46 deletions

File tree

‎Modules/_tracemalloc.c‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,8 @@ traceback_get_frames(traceback_t *traceback)
347347
return;
348348
}
349349

350-
_PyInterpreterFrame *pyframe = tstate->cframe->current_frame;
351-
for (;;) {
352-
while (pyframe && _PyFrame_IsIncomplete(pyframe)) {
353-
pyframe = pyframe->previous;
354-
}
355-
if (pyframe == NULL) {
356-
break;
357-
}
350+
_PyInterpreterFrame *pyframe = _PyThreadState_GetFrame(tstate);
351+
while (pyframe) {
358352
if (traceback->nframe < tracemalloc_config.max_nframe) {
359353
tracemalloc_get_frame(pyframe, &traceback->frames[traceback->nframe]);
360354
assert(traceback->frames[traceback->nframe].filename != NULL);
@@ -363,8 +357,7 @@ traceback_get_frames(traceback_t *traceback)
363357
if (traceback->total_nframe < UINT16_MAX) {
364358
traceback->total_nframe++;
365359
}
366-
367-
pyframe = pyframe->previous;
360+
pyframe = _PyFrame_GetComplete(pyframe->previous);
368361
}
369362
}
370363

‎Modules/signalmodule.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,10 +1803,7 @@ _PyErr_CheckSignalsTstate(PyThreadState *tstate)
18031803
*/
18041804
_Py_atomic_store(&is_tripped, 0);
18051805

1806-
_PyInterpreterFrame *frame = tstate->cframe->current_frame;
1807-
while (frame && _PyFrame_IsIncomplete(frame)) {
1808-
frame = frame->previous;
1809-
}
1806+
_PyInterpreterFrame *frame = _PyThreadState_GetFrame(tstate);
18101807
signal_state_t *state = &signal_global_state;
18111808
for (int i = 1; i < Py_NSIG; i++) {
18121809
if (!_Py_atomic_load_relaxed(&Handlers[i].tripped)) {

‎Objects/frameobject.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,9 +1408,7 @@ PyFrame_GetBack(PyFrameObject *frame)
14081408
PyFrameObject *back = frame->f_back;
14091409
if (back == NULL) {
14101410
_PyInterpreterFrame *prev = frame->f_frame->previous;
1411-
while (prev && _PyFrame_IsIncomplete(prev)) {
1412-
prev = prev->previous;
1413-
}
1411+
prev = _PyFrame_GetComplete(prev);
14141412
if (prev) {
14151413
back = _PyFrame_GetFrameObject(prev);
14161414
}

‎Objects/genobject.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -903,8 +903,11 @@ _Py_MakeCoro(PyFunctionObject *func)
903903
if (origin_depth == 0) {
904904
((PyCoroObject *)coro)->cr_origin_or_finalizer = NULL;
905905
} else {
906-
assert(_PyEval_GetFrame());
907-
PyObject *cr_origin = compute_cr_origin(origin_depth, _PyEval_GetFrame()->previous);
906+
_PyInterpreterFrame *frame = tstate->cframe->current_frame;
907+
assert(frame);
908+
assert(_PyFrame_IsIncomplete(frame));
909+
frame = _PyFrame_GetComplete(frame->previous);
910+
PyObject *cr_origin = compute_cr_origin(origin_depth, frame);
908911
((PyCoroObject *)coro)->cr_origin_or_finalizer = cr_origin;
909912
if (!cr_origin) {
910913
Py_DECREF(coro);
@@ -1286,7 +1289,7 @@ compute_cr_origin(int origin_depth, _PyInterpreterFrame *current_frame)
12861289
/* First count how many frames we have */
12871290
int frame_count = 0;
12881291
for (; frame && frame_count < origin_depth; ++frame_count) {
1289-
frame = frame->previous;
1292+
frame = _PyFrame_GetComplete(frame->previous);
12901293
}
12911294

12921295
/* Now collect them */
@@ -1305,7 +1308,7 @@ compute_cr_origin(int origin_depth, _PyInterpreterFrame *current_frame)
13051308
return NULL;
13061309
}
13071310
PyTuple_SET_ITEM(cr_origin, i, frameinfo);
1308-
frame = frame->previous;
1311+
frame = _PyFrame_GetComplete(frame->previous);
13091312
}
13101313

13111314
return cr_origin;

‎Objects/typeobject.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9579,13 +9579,13 @@ super_init_impl(PyObject *self, PyTypeObject *type, PyObject *obj) {
95799579
/* Call super(), without args -- fill in from __class__
95809580
and first local variable on the stack. */
95819581
PyThreadState *tstate = _PyThreadState_GET();
9582-
_PyInterpreterFrame *cframe = tstate->cframe->current_frame;
9583-
if (cframe == NULL) {
9582+
_PyInterpreterFrame *frame = _PyThreadState_GetFrame(tstate);
9583+
if (frame == NULL) {
95849584
PyErr_SetString(PyExc_RuntimeError,
95859585
"super(): no current frame");
95869586
return -1;
95879587
}
9588-
int res = super_init_without_args(cframe, cframe->f_code, &type, &obj);
9588+
int res = super_init_without_args(frame, frame->f_code, &type, &obj);
95899589

95909590
if (res < 0) {
95919591
return -1;

‎Python/ceval.c‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2752,16 +2752,13 @@ _PyInterpreterFrame *
27522752
_PyEval_GetFrame(void)
27532753
{
27542754
PyThreadState *tstate = _PyThreadState_GET();
2755-
return tstate->cframe->current_frame;
2755+
return _PyThreadState_GetFrame(tstate);
27562756
}
27572757

27582758
PyFrameObject *
27592759
PyEval_GetFrame(void)
27602760
{
27612761
_PyInterpreterFrame *frame = _PyEval_GetFrame();
2762-
while (frame && _PyFrame_IsIncomplete(frame)) {
2763-
frame = frame->previous;
2764-
}
27652762
if (frame == NULL) {
27662763
return NULL;
27672764
}
@@ -2775,7 +2772,7 @@ PyEval_GetFrame(void)
27752772
PyObject *
27762773
_PyEval_GetBuiltins(PyThreadState *tstate)
27772774
{
2778-
_PyInterpreterFrame *frame = tstate->cframe->current_frame;
2775+
_PyInterpreterFrame *frame = _PyThreadState_GetFrame(tstate);
27792776
if (frame != NULL) {
27802777
return frame->f_builtins;
27812778
}
@@ -2814,7 +2811,7 @@ PyObject *
28142811
PyEval_GetLocals(void)
28152812
{
28162813
PyThreadState *tstate = _PyThreadState_GET();
2817-
_PyInterpreterFrame *current_frame = tstate->cframe->current_frame;
2814+
_PyInterpreterFrame *current_frame = _PyThreadState_GetFrame(tstate);
28182815
if (current_frame == NULL) {
28192816
_PyErr_SetString(tstate, PyExc_SystemError, "frame does not exist");
28202817
return NULL;
@@ -2833,7 +2830,7 @@ PyObject *
28332830
PyEval_GetGlobals(void)
28342831
{
28352832
PyThreadState *tstate = _PyThreadState_GET();
2836-
_PyInterpreterFrame *current_frame = tstate->cframe->current_frame;
2833+
_PyInterpreterFrame *current_frame = _PyThreadState_GetFrame(tstate);
28372834
if (current_frame == NULL) {
28382835
return NULL;
28392836
}

‎Python/frame.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
9696
}
9797
assert(!_PyFrame_IsIncomplete(frame));
9898
assert(f->f_back == NULL);
99-
_PyInterpreterFrame *prev = frame->previous;
100-
while (prev && _PyFrame_IsIncomplete(prev)) {
101-
prev = prev->previous;
102-
}
99+
_PyInterpreterFrame *prev = _PyFrame_GetComplete(frame->previous);
103100
frame->previous = NULL;
104101
if (prev) {
105102
assert(prev->owner != FRAME_OWNED_BY_CSTACK);

‎Python/pystate.c‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,10 +1302,7 @@ PyFrameObject*
13021302
PyThreadState_GetFrame(PyThreadState *tstate)
13031303
{
13041304
assert(tstate != NULL);
1305-
_PyInterpreterFrame *f = tstate->cframe->current_frame;
1306-
while (f && _PyFrame_IsIncomplete(f)) {
1307-
f = f->previous;
1308-
}
1305+
_PyInterpreterFrame *f = _PyThreadState_GetFrame(tstate);
13091306
if (f == NULL) {
13101307
return NULL;
13111308
}
@@ -1431,9 +1428,7 @@ _PyThread_CurrentFrames(void)
14311428
PyThreadState *t;
14321429
for (t = i->threads.head; t != NULL; t = t->next) {
14331430
_PyInterpreterFrame *frame = t->cframe->current_frame;
1434-
while (frame && _PyFrame_IsIncomplete(frame)) {
1435-
frame = frame->previous;
1436-
}
1431+
frame = _PyFrame_GetComplete(frame);
14371432
if (frame == NULL) {
14381433
continue;
14391434
}

‎Python/sysmodule.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,13 +1884,10 @@ sys__getframe_impl(PyObject *module, int depth)
18841884

18851885
if (frame != NULL) {
18861886
while (depth > 0) {
1887-
frame = frame->previous;
1887+
frame = _PyFrame_GetComplete(frame->previous);
18881888
if (frame == NULL) {
18891889
break;
18901890
}
1891-
if (_PyFrame_IsIncomplete(frame)) {
1892-
continue;
1893-
}
18941891
--depth;
18951892
}
18961893
}

0 commit comments

Comments
 (0)