mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 07:26:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-45431: Rename CFrame to _PyCFrame in the C API (GH-31584)

Browse source 
Rename also struct _cframe to struct _PyCFrame.

Add a comment suggesting using public functions rather than using
directly the private _PyCFrame structure.
This commit is contained in:
Victor Stinner 2022-02-28 16:03:57 +01:00 • committed by GitHub
parent 4558af5a8f
commit 7496f95873
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Include/cpython/pystate.h
View file

@ -33,7 +33,9 @@ typedef struct {
PyCodeAddressRange bounds; // Only valid if code != NULL. PyCodeAddressRange bounds; // Only valid if code != NULL.
} PyTraceInfo; } PyTraceInfo;
typedef struct _cframe { // Internal structure: you should not use it directly, but use public functions
// like PyThreadState_EnterTracing() and PyThreadState_LeaveTracing().
typedef struct _PyCFrame {
/* This struct will be threaded through the C stack /* This struct will be threaded through the C stack
* allowing fast access to per-thread state that needs * allowing fast access to per-thread state that needs
* to be accessed quickly by the interpreter, but can * to be accessed quickly by the interpreter, but can
@ -47,8 +49,8 @@ typedef struct _cframe {
int use_tracing; int use_tracing;
/* Pointer to the currently executing frame (it can be NULL) */ /* Pointer to the currently executing frame (it can be NULL) */
struct _PyInterpreterFrame *current_frame; struct _PyInterpreterFrame *current_frame;
struct _cframe *previous; struct _PyCFrame *previous;
} CFrame; } _PyCFrame;
typedef struct _err_stackitem { typedef struct _err_stackitem {
/* This struct represents a single execution context where we might /* This struct represents a single execution context where we might
@ -102,9 +104,9 @@ struct _ts {
the trace/profile. */ the trace/profile. */
int tracing; int tracing;
/* Pointer to current CFrame in the C stack frame of the currently, /* Pointer to current _PyCFrame in the C stack frame of the currently,
* or most recently, executing _PyEval_EvalFrameDefault. */ * or most recently, executing _PyEval_EvalFrameDefault. */
CFrame *cframe; _PyCFrame *cframe;
Py_tracefunc c_profilefunc; Py_tracefunc c_profilefunc;
Py_tracefunc c_tracefunc; Py_tracefunc c_tracefunc;
@ -196,7 +198,7 @@ struct _ts {
_PyErr_StackItem exc_state; _PyErr_StackItem exc_state;
/* The bottom-most frame on the stack. */ /* The bottom-most frame on the stack. */
CFrame root_cframe; _PyCFrame root_cframe;
}; };

2
Include/internal/pycore_frame.h
View file

@ -59,7 +59,7 @@ typedef struct _PyInterpreterFrame {
int f_lasti; /* Last instruction if called */ int f_lasti; /* Last instruction if called */
int stacktop; /* Offset of TOS from localsplus */ int stacktop; /* Offset of TOS from localsplus */
PyFrameState f_state; /* What state the frame is in */ PyFrameState f_state; /* What state the frame is in */
bool is_entry; // Whether this is the "root" frame for the current CFrame. bool is_entry; // Whether this is the "root" frame for the current _PyCFrame.
bool is_generator; bool is_generator;
PyObject *localsplus[1]; PyObject *localsplus[1];
} _PyInterpreterFrame; } _PyInterpreterFrame;

6
Python/ceval.c
View file

@ -1616,15 +1616,15 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
int oparg; /* Current opcode argument, if any */ int oparg; /* Current opcode argument, if any */
_Py_atomic_int * const eval_breaker = &tstate->interp->ceval.eval_breaker; _Py_atomic_int * const eval_breaker = &tstate->interp->ceval.eval_breaker;
CFrame cframe; _PyCFrame cframe;
CallShape call_shape; CallShape call_shape;
call_shape.kwnames = NULL; // Borrowed reference. Reset by CALL instructions. call_shape.kwnames = NULL; // Borrowed reference. Reset by CALL instructions.
/* WARNING: Because the CFrame lives on the C stack, /* WARNING: Because the _PyCFrame lives on the C stack,
* but can be accessed from a heap allocated object (tstate) * but can be accessed from a heap allocated object (tstate)
* strict stack discipline must be maintained. * strict stack discipline must be maintained.
*/ */
CFrame *prev_cframe = tstate->cframe; _PyCFrame *prev_cframe = tstate->cframe;
cframe.use_tracing = prev_cframe->use_tracing; cframe.use_tracing = prev_cframe->use_tracing;
cframe.previous = prev_cframe; cframe.previous = prev_cframe;
tstate->cframe = &cframe; tstate->cframe = &cframe;