Skip to content

Commit af9703a

Browse files
picnixzpicnixz
committed
fixup
1 parent 77b2576 commit af9703a

File tree

1 file changed

+37
-30
lines changed

1 file changed

+37
-30
lines changed

‎Python/legacy_tracing.c‎

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ sys_profile_start(
5959
PyObject *op, PyObject *const *args,
6060
size_t nargsf, PyObject *kwnames
6161
) {
62+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
6263
assert(kwnames == NULL);
6364
assert(PyVectorcall_NARGS(nargsf) == 2);
64-
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
6565
return call_profile_func(self, Py_None);
6666
}
6767

@@ -70,9 +70,9 @@ sys_profile_throw(
7070
PyObject *op, PyObject *const *args,
7171
size_t nargsf, PyObject *kwnames
7272
) {
73+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
7374
assert(kwnames == NULL);
7475
assert(PyVectorcall_NARGS(nargsf) == 3);
75-
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
7676
return call_profile_func(self, Py_None);
7777
}
7878

@@ -81,9 +81,9 @@ sys_profile_return(
8181
PyObject *op, PyObject *const *args,
8282
size_t nargsf, PyObject *kwnames
8383
) {
84+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
8485
assert(kwnames == NULL);
8586
assert(PyVectorcall_NARGS(nargsf) == 3);
86-
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
8787
return call_profile_func(self, args[2]);
8888
}
8989

@@ -92,9 +92,9 @@ sys_profile_unwind(
9292
PyObject *op, PyObject *const *args,
9393
size_t nargsf, PyObject *kwnames
9494
) {
95+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
9596
assert(kwnames == NULL);
9697
assert(PyVectorcall_NARGS(nargsf) == 3);
97-
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
9898
return call_profile_func(self, NULL);
9999
}
100100

@@ -103,9 +103,9 @@ sys_profile_call_or_return(
103103
PyObject *op, PyObject *const *args,
104104
size_t nargsf, PyObject *kwnames
105105
) {
106+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
106107
assert(kwnames == NULL);
107108
assert(PyVectorcall_NARGS(nargsf) == 4);
108-
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
109109
PyObject *callable = args[2];
110110
if (PyCFunction_Check(callable)) {
111111
return call_profile_func(self, callable);
@@ -190,9 +190,10 @@ call_trace_func(_PyLegacyEventHandler *self, PyObject *arg)
190190

191191
static PyObject *
192192
sys_trace_exception_func(
193-
_PyLegacyEventHandler *self, PyObject *const *args,
193+
PyObject *op, PyObject *const *args,
194194
size_t nargsf, PyObject *kwnames
195195
) {
196+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
196197
assert(kwnames == NULL);
197198
assert(PyVectorcall_NARGS(nargsf) == 3);
198199
PyObject *exc = args[2];
@@ -214,39 +215,43 @@ sys_trace_exception_func(
214215

215216
static PyObject *
216217
sys_trace_start(
217-
_PyLegacyEventHandler *self, PyObject *const *args,
218+
PyObject *op, PyObject *const *args,
218219
size_t nargsf, PyObject *kwnames
219220
) {
221+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
220222
assert(kwnames == NULL);
221223
assert(PyVectorcall_NARGS(nargsf) == 2);
222224
return call_trace_func(self, Py_None);
223225
}
224226

225227
static PyObject *
226228
sys_trace_throw(
227-
_PyLegacyEventHandler *self, PyObject *const *args,
229+
PyObject *op, PyObject *const *args,
228230
size_t nargsf, PyObject *kwnames
229231
) {
232+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
230233
assert(kwnames == NULL);
231234
assert(PyVectorcall_NARGS(nargsf) == 3);
232235
return call_trace_func(self, Py_None);
233236
}
234237

235238
static PyObject *
236239
sys_trace_unwind(
237-
_PyLegacyEventHandler *self, PyObject *const *args,
240+
PyObject *op, PyObject *const *args,
238241
size_t nargsf, PyObject *kwnames
239242
) {
243+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
240244
assert(kwnames == NULL);
241245
assert(PyVectorcall_NARGS(nargsf) == 3);
242246
return call_trace_func(self, NULL);
243247
}
244248

245249
static PyObject *
246250
sys_trace_return(
247-
_PyLegacyEventHandler *self, PyObject *const *args,
251+
PyObject *op, PyObject *const *args,
248252
size_t nargsf, PyObject *kwnames
249253
) {
254+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
250255
assert(!PyErr_Occurred());
251256
assert(kwnames == NULL);
252257
assert(PyVectorcall_NARGS(nargsf) == 3);
@@ -258,19 +263,21 @@ sys_trace_return(
258263

259264
static PyObject *
260265
sys_trace_yield(
261-
_PyLegacyEventHandler *self, PyObject *const *args,
266+
PyObject *op, PyObject *const *args,
262267
size_t nargsf, PyObject *kwnames
263268
) {
269+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
264270
assert(kwnames == NULL);
265271
assert(PyVectorcall_NARGS(nargsf) == 3);
266272
return call_trace_func(self, args[2]);
267273
}
268274

269275
static PyObject *
270276
sys_trace_instruction_func(
271-
_PyLegacyEventHandler *self, PyObject *const *args,
277+
PyObject *op, PyObject *const *args,
272278
size_t nargsf, PyObject *kwnames
273279
) {
280+
_PyLegacyEventHandler *self = _PyLegacyEventHandler_CAST(op);
274281
assert(kwnames == NULL);
275282
assert(PyVectorcall_NARGS(nargsf) == 2);
276283
PyFrameObject *frame = PyEval_GetFrame();
@@ -520,48 +527,48 @@ setup_tracing(PyThreadState *tstate, Py_tracefunc func, PyObject *arg, PyObject
520527
if (!tstate->interp->sys_trace_initialized) {
521528
tstate->interp->sys_trace_initialized = true;
522529
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
523-
(vectorcallfunc)sys_trace_start, PyTrace_CALL,
524-
PY_MONITORING_EVENT_PY_START, PY_MONITORING_EVENT_PY_RESUME)) {
530+
sys_trace_start, PyTrace_CALL,
531+
PY_MONITORING_EVENT_PY_START, PY_MONITORING_EVENT_PY_RESUME)) {
525532
return -1;
526533
}
527534
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
528-
(vectorcallfunc)sys_trace_throw, PyTrace_CALL,
529-
PY_MONITORING_EVENT_PY_THROW, -1)) {
535+
sys_trace_throw, PyTrace_CALL,
536+
PY_MONITORING_EVENT_PY_THROW, -1)) {
530537
return -1;
531538
}
532539
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
533-
(vectorcallfunc)sys_trace_return, PyTrace_RETURN,
534-
PY_MONITORING_EVENT_PY_RETURN, -1)) {
540+
sys_trace_return, PyTrace_RETURN,
541+
PY_MONITORING_EVENT_PY_RETURN, -1)) {
535542
return -1;
536543
}
537544
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
538-
(vectorcallfunc)sys_trace_yield, PyTrace_RETURN,
539-
PY_MONITORING_EVENT_PY_YIELD, -1)) {
545+
sys_trace_yield, PyTrace_RETURN,
546+
PY_MONITORING_EVENT_PY_YIELD, -1)) {
540547
return -1;
541548
}
542549
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
543-
(vectorcallfunc)sys_trace_exception_func, PyTrace_EXCEPTION,
544-
PY_MONITORING_EVENT_RAISE, PY_MONITORING_EVENT_STOP_ITERATION)) {
550+
sys_trace_exception_func, PyTrace_EXCEPTION,
551+
PY_MONITORING_EVENT_RAISE, PY_MONITORING_EVENT_STOP_ITERATION)) {
545552
return -1;
546553
}
547554
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
548-
(vectorcallfunc)sys_trace_line_func, PyTrace_LINE,
549-
PY_MONITORING_EVENT_LINE, -1)) {
555+
sys_trace_line_func, PyTrace_LINE,
556+
PY_MONITORING_EVENT_LINE, -1)) {
550557
return -1;
551558
}
552559
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
553-
(vectorcallfunc)sys_trace_unwind, PyTrace_RETURN,
554-
PY_MONITORING_EVENT_PY_UNWIND, -1)) {
560+
sys_trace_unwind, PyTrace_RETURN,
561+
PY_MONITORING_EVENT_PY_UNWIND, -1)) {
555562
return -1;
556563
}
557564
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
558-
(vectorcallfunc)sys_trace_jump_func, PyTrace_LINE,
559-
PY_MONITORING_EVENT_JUMP, -1)) {
565+
sys_trace_jump_func, PyTrace_LINE,
566+
PY_MONITORING_EVENT_JUMP, -1)) {
560567
return -1;
561568
}
562569
if (set_callbacks(PY_MONITORING_SYS_TRACE_ID,
563-
(vectorcallfunc)sys_trace_instruction_func, PyTrace_OPCODE,
564-
PY_MONITORING_EVENT_INSTRUCTION, -1)) {
570+
sys_trace_instruction_func, PyTrace_OPCODE,
571+
PY_MONITORING_EVENT_INSTRUCTION, -1)) {
565572
return -1;
566573
}
567574
}

0 commit comments

Comments
 (0)