Skip to content

bpo-45256: Remove the usage of the C stack in Python to Python calls#28488

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

Merged
pablogsal merged 17 commits into from
Oct 9, 2021
Merged

bpo-45256: Remove the usage of the C stack in Python to Python calls #28488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8a88fd3
Remove the usage of the cstack in Python to Python calls
pablogsal Sep 17, 2021
799e366
Fix gdb
pablogsal Sep 17, 2021
306e29f
Move depth to frame structure for easier retrieval in debugging tools
pablogsal Sep 17, 2021
fc36be1
Refactor and simplifications
pablogsal Sep 17, 2021
e1091e0
Fix existing bug in the PREDICT() macro for the codepath without comp…
pablogsal Sep 21, 2021
d7a99c1
Apply suggestions from code review
pablogsal Sep 21, 2021
0721cea
Tracing of Python functions is handled at entry not call.
markshannon Sep 23, 2021
a2c0994
Inline creation of coroutines.
markshannon Sep 23, 2021
832bccf
Merge remote-tracking branch 'upstream/main' into simple_cframe
pablogsal Sep 23, 2021
9a63ee1
Reorder flow in CALL_FUNCTION to make it a bit clearer.
markshannon Sep 23, 2021
919b741
Merge pull request #16 from markshannon/simple_cframe
pablogsal Sep 23, 2021
9210541
Update Python/ceval.c
pablogsal Sep 23, 2021
9ce9e63
Fix reference counting when creating a new interpreter frame fails.
markshannon Sep 24, 2021
9a0ceab
Remove _PyEval_FrameFromPyFunctionAndArgs forwarding function.
markshannon Sep 24, 2021
65219b2
Merge pull request #17 from markshannon/simple_cframe
pablogsal Sep 24, 2021
1de88f6
Fix reference leaks (needs cleanup)
pablogsal Sep 29, 2021
f313e8c
Merge branch 'main' into simple_cframe
pablogsal Oct 7, 2021
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
2 changes: 2 additions & 0 deletions Include/internal/pycore_frame.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ typedef struct _interpreter_frame{
int f_lasti; /* Last instruction if called */
int stacktop; /* Offset of TOS from localsplus */
PyFrameState f_state; /* What state the frame is in */
int depth; /* Depth of the frame in a ceval loop */
PyObject *localsplus[1];
} InterpreterFrame;

Expand DownExpand Up@@ -85,6 +86,7 @@ _PyFrame_InitializeSpecials(
frame->generator = NULL;
frame->f_lasti = -1;
frame->f_state = FRAME_CREATED;
frame->depth = 0;
}

/* Gets the pointer to the locals array
Expand Down
1 change: 1 addition & 0 deletions Include/internal/pycore_tuple.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ extern "C"{
#define _PyTuple_ITEMS(op) (_PyTuple_CAST(op)->ob_item)

extern PyObject *_PyTuple_FromArray(PyObject *const *, Py_ssize_t);
extern PyObject *_PyTuple_FromArraySteal(PyObject *const *, Py_ssize_t);

#ifdef __cplusplus
}
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/gdb_sample.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
# Sample script for use by test_gdb.py

def foo(a, b, c):
bar(a, b, c)
bar(a=a, b=b, c=c)

def bar(a, b, c):
baz(a, b, c)
Expand Down
26 changes: 23 additions & 3 deletions Lib/test/test_gdb.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -734,8 +734,14 @@ def test_pyup_command(self):
cmds_after_breakpoint=['py-up', 'py-up'])
self.assertMultilineMatches(bt,
r'''^.*
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 10, in baz \(args=\(1, 2, 3\)\)
id\(42\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
baz\(a, b, c\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 4, in foo \(a=1, b=2, c=3\)
bar\(a=a, b=b, c=c\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 12, in <module> \(\)
foo\(1, 2, 3\)
$''')

@unittest.skipUnless(HAS_PYUP_PYDOWN, "test requires py-up/py-down commands")
Expand DownExpand Up@@ -763,10 +769,18 @@ def test_up_then_down(self):
cmds_after_breakpoint=['py-up', 'py-up', 'py-down'])
self.assertMultilineMatches(bt,
r'''^.*
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 10, in baz \(args=\(1, 2, 3\)\)
id\(42\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
baz\(a, b, c\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 4, in foo \(a=1, b=2, c=3\)
bar\(a=a, b=b, c=c\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 12, in <module> \(\)
foo\(1, 2, 3\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 10, in baz \(args=\(1, 2, 3\)\)
id\(42\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
baz\(a, b, c\)
$''')

class PyBtTests(DebuggerTests):
Expand All@@ -785,7 +799,7 @@ def test_bt(self):
File ".*gdb_sample.py", line 7, in bar
baz\(a, b, c\)
File ".*gdb_sample.py", line 4, in foo
bar\(a, b, c\)
bar\(a=a, b=b, c=c\)
File ".*gdb_sample.py", line 12, in <module>
foo\(1, 2, 3\)
''')
Expand All@@ -801,7 +815,7 @@ def test_bt_full(self):
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
baz\(a, b, c\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 4, in foo \(a=1, b=2, c=3\)
bar\(a, b, c\)
bar\(a=a, b=b, c=c\)
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 12, in <module> \(\)
foo\(1, 2, 3\)
''')
Expand DownExpand Up@@ -1008,7 +1022,13 @@ def test_locals_after_up(self):
bt = self.get_stack_trace(script=self.get_sample_script(),
cmds_after_breakpoint=['py-up', 'py-up', 'py-locals'])
self.assertMultilineMatches(bt,
r".*\na = 1\nb = 2\nc = 3\n.*")
r'''^.*
Locals for foo
a = 1
b = 2
c = 3
Locals for <module>
.*$''')


def setUpModule():
Expand Down
20 changes: 20 additions & 0 deletions Objects/tupleobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,26 @@ _PyTuple_FromArray(PyObject *const *src, Py_ssize_t n)
return (PyObject *)tuple;
}

PyObject *
_PyTuple_FromArraySteal(PyObject *const *src, Py_ssize_t n)
{
if (n == 0){
return tuple_get_empty();
}

PyTupleObject *tuple = tuple_alloc(n);
if (tuple == NULL){
return NULL;
}
PyObject **dst = tuple->ob_item;
for (Py_ssize_t i = 0; i < n; i++){
PyObject *item = src[i];
dst[i] = item;
}
_PyObject_GC_TRACK(tuple);
return (PyObject *)tuple;
}

static PyObject *
tupleslice(PyTupleObject *a, Py_ssize_t ilow,
Py_ssize_t ihigh)
Expand Down
Loading