mirror of
https://github.com/python/cpython
synced 2024-09-18 20:51:39 +00:00
gh-116626: Emit CALL
events for all INSTRUMENTED_CALL_FUNCTION_EX
(GH-116627)
This commit is contained in:
parent
ba82a241ac
commit
8332e85b2f
|
@ -1807,6 +1807,21 @@ def test_gh108976(self):
|
||||||
sys.monitoring.set_events(0, E.LINE | E.INSTRUCTION)
|
sys.monitoring.set_events(0, E.LINE | E.INSTRUCTION)
|
||||||
sys.monitoring.set_events(0, 0)
|
sys.monitoring.set_events(0, 0)
|
||||||
|
|
||||||
|
def test_call_function_ex(self):
|
||||||
|
def f(a, b):
|
||||||
|
return a + b
|
||||||
|
args = (1, 2)
|
||||||
|
|
||||||
|
call_data = []
|
||||||
|
sys.monitoring.use_tool_id(0, "test")
|
||||||
|
self.addCleanup(sys.monitoring.free_tool_id, 0)
|
||||||
|
sys.monitoring.set_events(0, 0)
|
||||||
|
sys.monitoring.register_callback(0, E.CALL, lambda code, offset, callable, arg0: call_data.append((callable, arg0)))
|
||||||
|
sys.monitoring.set_events(0, E.CALL)
|
||||||
|
f(*args)
|
||||||
|
sys.monitoring.set_events(0, 0)
|
||||||
|
self.assertEqual(call_data[0], (f, 1))
|
||||||
|
|
||||||
|
|
||||||
class TestOptimizer(MonitoringTestBase, unittest.TestCase):
|
class TestOptimizer(MonitoringTestBase, unittest.TestCase):
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Ensure ``INSTRUMENTED_CALL_FUNCTION_EX`` always emits :monitoring-event:`CALL`
|
|
@ -3729,9 +3729,7 @@ dummy_func(
|
||||||
}
|
}
|
||||||
assert(PyTuple_CheckExact(callargs));
|
assert(PyTuple_CheckExact(callargs));
|
||||||
EVAL_CALL_STAT_INC_IF_FUNCTION(EVAL_CALL_FUNCTION_EX, func);
|
EVAL_CALL_STAT_INC_IF_FUNCTION(EVAL_CALL_FUNCTION_EX, func);
|
||||||
if (opcode == INSTRUMENTED_CALL_FUNCTION_EX &&
|
if (opcode == INSTRUMENTED_CALL_FUNCTION_EX) {
|
||||||
!PyFunction_Check(func) && !PyMethod_Check(func)
|
|
||||||
) {
|
|
||||||
PyObject *arg = PyTuple_GET_SIZE(callargs) > 0 ?
|
PyObject *arg = PyTuple_GET_SIZE(callargs) > 0 ?
|
||||||
PyTuple_GET_ITEM(callargs, 0) : Py_None;
|
PyTuple_GET_ITEM(callargs, 0) : Py_None;
|
||||||
int err = _Py_call_instrumentation_2args(
|
int err = _Py_call_instrumentation_2args(
|
||||||
|
@ -3739,6 +3737,8 @@ dummy_func(
|
||||||
frame, this_instr, func, arg);
|
frame, this_instr, func, arg);
|
||||||
if (err) GOTO_ERROR(error);
|
if (err) GOTO_ERROR(error);
|
||||||
result = PyObject_Call(func, callargs, kwargs);
|
result = PyObject_Call(func, callargs, kwargs);
|
||||||
|
|
||||||
|
if (!PyFunction_Check(func) && !PyMethod_Check(func)) {
|
||||||
if (result == NULL) {
|
if (result == NULL) {
|
||||||
_Py_call_instrumentation_exc2(
|
_Py_call_instrumentation_exc2(
|
||||||
tstate, PY_MONITORING_EVENT_C_RAISE,
|
tstate, PY_MONITORING_EVENT_C_RAISE,
|
||||||
|
@ -3753,6 +3753,7 @@ dummy_func(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
if (Py_TYPE(func) == &PyFunction_Type &&
|
if (Py_TYPE(func) == &PyFunction_Type &&
|
||||||
tstate->interp->eval_frame == NULL &&
|
tstate->interp->eval_frame == NULL &&
|
||||||
|
|
6
Python/generated_cases.c.h
generated
6
Python/generated_cases.c.h
generated
|
@ -1205,9 +1205,7 @@
|
||||||
}
|
}
|
||||||
assert(PyTuple_CheckExact(callargs));
|
assert(PyTuple_CheckExact(callargs));
|
||||||
EVAL_CALL_STAT_INC_IF_FUNCTION(EVAL_CALL_FUNCTION_EX, func);
|
EVAL_CALL_STAT_INC_IF_FUNCTION(EVAL_CALL_FUNCTION_EX, func);
|
||||||
if (opcode == INSTRUMENTED_CALL_FUNCTION_EX &&
|
if (opcode == INSTRUMENTED_CALL_FUNCTION_EX) {
|
||||||
!PyFunction_Check(func) && !PyMethod_Check(func)
|
|
||||||
) {
|
|
||||||
PyObject *arg = PyTuple_GET_SIZE(callargs) > 0 ?
|
PyObject *arg = PyTuple_GET_SIZE(callargs) > 0 ?
|
||||||
PyTuple_GET_ITEM(callargs, 0) : Py_None;
|
PyTuple_GET_ITEM(callargs, 0) : Py_None;
|
||||||
int err = _Py_call_instrumentation_2args(
|
int err = _Py_call_instrumentation_2args(
|
||||||
|
@ -1215,6 +1213,7 @@
|
||||||
frame, this_instr, func, arg);
|
frame, this_instr, func, arg);
|
||||||
if (err) GOTO_ERROR(error);
|
if (err) GOTO_ERROR(error);
|
||||||
result = PyObject_Call(func, callargs, kwargs);
|
result = PyObject_Call(func, callargs, kwargs);
|
||||||
|
if (!PyFunction_Check(func) && !PyMethod_Check(func)) {
|
||||||
if (result == NULL) {
|
if (result == NULL) {
|
||||||
_Py_call_instrumentation_exc2(
|
_Py_call_instrumentation_exc2(
|
||||||
tstate, PY_MONITORING_EVENT_C_RAISE,
|
tstate, PY_MONITORING_EVENT_C_RAISE,
|
||||||
|
@ -1229,6 +1228,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
if (Py_TYPE(func) == &PyFunction_Type &&
|
if (Py_TYPE(func) == &PyFunction_Type &&
|
||||||
tstate->interp->eval_frame == NULL &&
|
tstate->interp->eval_frame == NULL &&
|
||||||
|
|
Loading…
Reference in a new issue