Skip to content

Add support for sys.monitoring events. #9482

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
sklam merged 8 commits into from
Apr 26, 2024
Merged

Add support for sys.monitoring events. #9482

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7a19e9a
Add support for `sys.monitoring` events.
stuartarchibald Feb 16, 2024
4f870eb
Add support for RAISE and PY_UNWIND events.
stuartarchibald Apr 19, 2024
88c224a
Merge 'main' into wip/sys_monitoring
stuartarchibald Apr 22, 2024
0899844
Fix RST preference for underlining of headers.
stuartarchibald Apr 22, 2024
28ca083
Fix cProfile for Python < 3.11 when numba raises.
stuartarchibald Apr 24, 2024
3a17c60
Fix RST syntax in sys.monitoring docs.
stuartarchibald Apr 24, 2024
5d652e7
Workaround potential CPython bug.
stuartarchibald Apr 26, 2024
25535b3
Fix comment to read more clearly.
stuartarchibald Apr 26, 2024
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
Prev Previous commit
Next Next commit
Fix cProfile for Python < 3.11 when numba raises. 
If a Numba function is being run under cProfile and the
function raises an exception, the dispatcher must handle
this correctly. It is not valid to call
`PyFrame_FastToLocals` without saving and restoring the
exception state across the call as it can clear the
exception state itself. This patch fixes this problem and
also stops calling `PyFrame_LocalsToFast` in Python 3.11
where the "whats-new" docs claim that the frames are now
looked after by the virutal machine.
  • Loading branch information
@stuartarchibald
stuartarchibald committed Apr 24, 2024
commit 28ca08364b9b94cbcefd61e71c15b0af22a96bdb
33 changes: 27 additions & 6 deletions numba/_dispatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,13 @@ call_cfunc(Dispatcher *self, PyObject *cfunc, PyObject *args, PyObject *kws, PyO
PyObject *builtins = PyEval_GetBuiltins();
PyFrameObject *frame = NULL;
PyObject *result = NULL;
#if (PY_MAJOR_VERSION >= 3) && ((PY_MINOR_VERSION == 9) || (PY_MINOR_VERSION == 10))
// Only used in 3.9 and 3.10, to help with saving/restoring exception state
PyObject *pyexc = NULL;
PyObject *err_type = NULL;
PyObject *err_value = NULL;
PyObject *err_traceback = NULL;
#endif

if (!code) {
PyErr_Format(PyExc_RuntimeError, "No __code__ attribute found.");
Expand All @@ -734,17 +741,31 @@ call_cfunc(Dispatcher *self, PyObject *cfunc, PyObject *args, PyObject *kws, PyO
if (frame == NULL) {
goto error;
}
/* Populate the 'fast locals' in `frame` */
PyFrame_LocalsToFast(frame, 0);
#if (PY_MAJOR_VERSION >= 3) && (PY_MINOR_VERSION == 12)
/* empty */
#elif (PY_MAJOR_VERSION >= 3) && (PY_MINOR_VERSION == 11)
#if (PY_MAJOR_VERSION >= 3) && (PY_MINOR_VERSION == 11)
// Python 3.11 improved the frame infrastructure such that frames are
// updated by the virtual machine, no need to do PyFrame_LocalsToFast
// and PyFrame_FastToLocals to ensure `frame->f_locals` is consistent.
C_TRACE(result, fn(PyCFunction_GET_SELF(cfunc), args, kws), frame);
#else
// Populate the 'fast locals' in `frame`
PyFrame_LocalsToFast(frame, 0);
tstate->frame = frame;

// make the call
C_TRACE(result, fn(PyCFunction_GET_SELF(cfunc), args, kws));
/* write changes back to locals? */

// write changes back to locals?
// PyFrame_FastToLocals can clear the exception indicator, therefore
// this state needs saving and restoring across the call if the
// exception indicator is set.
pyexc = PyErr_Occurred();
if (pyexc != NULL) {
PyErr_Fetch(&err_type, &err_value, &err_traceback);
}
PyFrame_FastToLocals(frame);
if (pyexc != NULL) {
PyErr_Restore(err_type, err_value, err_traceback);
}
tstate->frame = frame->f_back;
#endif
error:
Expand Down