https://github.com/python/cpython/commit/e91ef13861e88c27aed51a24e58d1dcc855a01dc
commit: e91ef13861e88c27aed51a24e58d1dcc855a01dc
branch: main
author: Tian Gao <[email protected]>
committer: gpshead <[email protected]>
date: 2024-07-23T15:25:26-07:00
summary:
gh-122029: Log call events in sys.setprofile when it's a method with c function
(GH-122072)
Log call events in sys.setprofile when it is a method with a C function.
files:
A Misc/NEWS.d/next/Core and
Builtins/2024-07-21-01-23-54.gh-issue-122029.gKv-e2.rst
M Lib/test/test_sys_setprofile.py
M Python/legacy_tracing.c
diff --git a/Lib/test/test_sys_setprofile.py b/Lib/test/test_sys_setprofile.py
index 32e03d7cd25dbe..b2e8e8a15b67ea 100644
--- a/Lib/test/test_sys_setprofile.py
+++ b/Lib/test/test_sys_setprofile.py
@@ -479,6 +479,20 @@ def f():
sys.setprofile(lambda *args: None)
f()
+ def test_method_with_c_function(self):
+ # gh-122029
+ # When we have a PyMethodObject whose im_func is a C function, we
+ # should record both the call and the return. f = classmethod(repr)
+ # is just a way to create a PyMethodObject with a C function.
+ class A:
+ f = classmethod(repr)
+ events = []
+ sys.setprofile(lambda frame, event, args: events.append(event))
+ A().f()
+ sys.setprofile(None)
+ # The last c_call is the call to sys.setprofile
+ self.assertEqual(events, ['c_call', 'c_return', 'c_call'])
+
if __name__ == "__main__":
unittest.main()
diff --git a/Misc/NEWS.d/next/Core and
Builtins/2024-07-21-01-23-54.gh-issue-122029.gKv-e2.rst b/Misc/NEWS.d/next/Core
and Builtins/2024-07-21-01-23-54.gh-issue-122029.gKv-e2.rst
new file mode 100644
index 00000000000000..bddee3a57fba80
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and
Builtins/2024-07-21-01-23-54.gh-issue-122029.gKv-e2.rst
@@ -0,0 +1 @@
+Emit ``c_call`` events in :func:`sys.setprofile` when a ``PyMethodObject``
pointing to a ``PyCFunction`` is called.
diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c
index 1103d999dfaea5..9cc3af1f5e162c 100644
--- a/Python/legacy_tracing.c
+++ b/Python/legacy_tracing.c
@@ -121,6 +121,19 @@ sys_profile_call_or_return(
Py_DECREF(meth);
return res;
}
+ else if (Py_TYPE(callable) == &PyMethod_Type) {
+ // CALL instruction will grab the function from the method,
+ // so if the function is a C function, the return event will
+ // be emitted. However, CALL event happens before CALL
+ // instruction, so we need to handle this case here.
+ PyObject* func = PyMethod_GET_FUNCTION(callable);
+ if (func == NULL) {
+ return NULL;
+ }
+ if (PyCFunction_Check(func)) {
+ return call_profile_func(self, func);
+ }
+ }
Py_RETURN_NONE;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
