Skip to content

bpo-47215: Add undocumented, unstable FrameStack API for use by greenlets and similar libraries. #32303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
markshannon wants to merge 5 commits into from
Closed

bpo-47215: Add undocumented, unstable FrameStack API for use by greenlets and similar libraries. #32303

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5422b53
Add undocumented, unstable FrameStack API for use by greenlets and si…
markshannon Apr 4, 2022
f6a46a6
Add minimal documentation.
markshannon Apr 4, 2022
ca6b767
Merge branch 'main' into frame-stack-api
markshannon Aug 17, 2022
b21d198
Merge branch 'main' into frame-stack-api
markshannon Sep 7, 2022
1a82683
Change top/limit pair to free/limit pair to allow fast checks and NUL…
markshannon Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into frame-stack-api
  • Loading branch information
@markshannon
markshannon committed Sep 7, 2022
commit b21d1982ba8b1f4d7714aec1498ccb7750aba684
8 changes: 7 additions & 1 deletion Include/internal/pycore_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,13 @@ _PyFrame_LocalsToFast(_PyInterpreterFrame *frame, int clear);
static inline bool
_PyThreadState_HasStackSpace(PyThreadState *tstate, int size)
{
return tstate->frame_stack.top + size < tstate->frame_stack.limit;
assert(
(tstate->frame_stack.top == NULL && tstate->frame_stack.limit == NULL)
||
(tstate->frame_stack.top != NULL && tstate->frame_stack.limit != NULL)
);
return tstate->frame_stack.top != NULL &&
size < tstate->frame_stack.limit - tstate->frame_stack.top;
}

extern _PyInterpreterFrame *
Expand Down
13 changes: 5 additions & 8 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,15 +2187,12 @@ _PyInterpreterFrame *
_PyThreadState_PushFrame(PyThreadState *tstate, size_t size)
{
assert(size < INT_MAX/sizeof(PyObject *));
PyObject **base = tstate->frame_stack.top;
PyObject **top = base + size;
if (top >= tstate->frame_stack.limit) {
base = push_chunk(&tstate->frame_stack, (int)size);
if (_PyThreadState_HasStackSpace(tstate, (int)size)) {
_PyInterpreterFrame *res = (_PyInterpreterFrame *)tstate->frame_stack.top;
tstate->frame_stack.top += size;
return res;
}
else {
tstate->frame_stack.top = top;
}
return (_PyInterpreterFrame *)base;
return (_PyInterpreterFrame *)push_chunk(&tstate->frame_stack, (int)size);
}

void
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.