Skip to content

gh-91048: Chain some exceptions in _testexternalinspection.c #132970

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
pablogsal merged 8 commits into from
May 2, 2025
+52 −33
Merged

gh-91048: Chain some exceptions in _testexternalinspection.c #132970

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0664231
Add Py_UNREACHABLE
sergey-miryanov Apr 25, 2025
cd9a499
Remove unused refcnt
sergey-miryanov Apr 25, 2025
3ed2837
Reset result if can not close file descriptor
sergey-miryanov Apr 25, 2025
cc46cc2
Set exception only if not set
sergey-miryanov Apr 25, 2025
6a72bf9
Chain exception to get more info
sergey-miryanov Apr 25, 2025
6466cf9
Remove error string from macos impl to keep PermissionError
sergey-miryanov Apr 25, 2025
e718330
Replace macro with static function
sergey-miryanov Apr 25, 2025
40e099b
Remove chain_exceptions from remote_debug to make clang on macos happy
sergey-miryanov Apr 25, 2025
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
Replace macro with static function
  • Loading branch information
@sergey-miryanov
sergey-miryanov committed Apr 25, 2025
commit e7183302c4b95f4221bd08c9d91b31a0d24eea12
32 changes: 10 additions & 22 deletions Modules/_testexternalinspection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,6 @@
# define HAVE_PROCESS_VM_READV 0
#endif

#ifdef CHAIN_EXCEPTIONS
#error "CHAIN_EXCEPTIONS should not be defined"
#endif

#define CHAIN_EXCEPTIONS(Type, Msg) \
do { \
PyObject *exc = PyErr_GetRaisedException(); \
PyErr_SetString((Type), (Msg)); \
_PyErr_ChainExceptions1(exc); \
} while(0)


struct _Py_AsyncioModuleDebugOffsets {
struct _asyncio_task_object {
uint64_t size;
Expand Down Expand Up @@ -316,7 +304,7 @@ parse_task_name(
if ((flags & Py_TPFLAGS_LONG_SUBCLASS)) {
long res = read_py_long(handle, offsets, task_name_addr);
if (res == -1) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to get task name");
chain_exceptions(PyExc_RuntimeError, "Failed to get task name");
return NULL;
}
return PyUnicode_FromFormat("Task-%d", res);
Expand Down Expand Up @@ -1181,13 +1169,13 @@ get_all_awaited_by(PyObject* self, PyObject* args)
struct _Py_DebugOffsets local_debug_offsets;

if (_Py_RemoteDebug_ReadDebugOffsets(handle, &runtime_start_addr, &local_debug_offsets)) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to read debug offsets");
chain_exceptions(PyExc_RuntimeError, "Failed to read debug offsets");
goto result_err;
}

struct _Py_AsyncioModuleDebugOffsets local_async_debug;
if (read_async_debug(handle, &local_async_debug)) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to read asyncio debug offsets");
chain_exceptions(PyExc_RuntimeError, "Failed to read asyncio debug offsets");
goto result_err;
}

Expand Down Expand Up @@ -1310,7 +1298,7 @@ get_stack_trace(PyObject* self, PyObject* args)
struct _Py_DebugOffsets local_debug_offsets;

if (_Py_RemoteDebug_ReadDebugOffsets(handle, &runtime_start_address, &local_debug_offsets)) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to read debug offsets");
chain_exceptions(PyExc_RuntimeError, "Failed to read debug offsets");
goto result_err;
}

Expand Down Expand Up @@ -1381,13 +1369,13 @@ get_async_stack_trace(PyObject* self, PyObject* args)
struct _Py_DebugOffsets local_debug_offsets;

if (_Py_RemoteDebug_ReadDebugOffsets(handle, &runtime_start_address, &local_debug_offsets)) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to read debug offsets");
chain_exceptions(PyExc_RuntimeError, "Failed to read debug offsets");
goto result_err;
}

struct _Py_AsyncioModuleDebugOffsets local_async_debug;
if (read_async_debug(handle, &local_async_debug)) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to read asyncio debug offsets");
chain_exceptions(PyExc_RuntimeError, "Failed to read asyncio debug offsets");
goto result_err;
}

Expand All @@ -1409,7 +1397,7 @@ get_async_stack_trace(PyObject* self, PyObject* args)
handle, runtime_start_address, &local_debug_offsets, &local_async_debug,
&running_task_addr)
) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to find running task");
chain_exceptions(PyExc_RuntimeError, "Failed to find running task");
goto result_err;
}

Expand All @@ -1424,7 +1412,7 @@ get_async_stack_trace(PyObject* self, PyObject* args)
running_task_addr + local_async_debug.asyncio_task_object.task_coro,
&running_coro_addr
)) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to read running task coro");
chain_exceptions(PyExc_RuntimeError, "Failed to read running task coro");
goto result_err;
}

Expand Down Expand Up @@ -1454,7 +1442,7 @@ get_async_stack_trace(PyObject* self, PyObject* args)
handle, runtime_start_address, &local_debug_offsets,
&address_of_current_frame)
) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to find running frame");
chain_exceptions(PyExc_RuntimeError, "Failed to find running frame");
goto result_err;
}

Expand All @@ -1470,7 +1458,7 @@ get_async_stack_trace(PyObject* self, PyObject* args)
);

if (res < 0) {
CHAIN_EXCEPTIONS(PyExc_RuntimeError, "Failed to parse async frame object");
chain_exceptions(PyExc_RuntimeError, "Failed to parse async frame object");
goto result_err;
}

Expand Down
17 changes: 11 additions & 6 deletions Python/remote_debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,15 @@ _Py_RemoteDebug_CleanupProcHandle(proc_handle_t *handle) {
handle->pid = 0;
}

// Helper to chain exceptions and avoid repetitions
static void
chain_exceptions(PyObject *exception, const char *string)
{
PyObject *exc = PyErr_GetRaisedException();
PyErr_SetString(exception, string);
_PyErr_ChainExceptions1(exc);
}

#if defined(__APPLE__) && TARGET_OS_OSX

static uintptr_t
Expand Down Expand Up @@ -688,18 +697,14 @@ _Py_RemoteDebug_GetPyRuntimeAddress(proc_handle_t* handle)
address = search_windows_map_for_section(handle, "PyRuntime", L"python");
if (address == 0) {
// Error out: 'python' substring covers both executable and DLL
PyObject *exc = PyErr_GetRaisedException();
PyErr_SetString(PyExc_RuntimeError, "Failed to find the PyRuntime section in the process.");
_PyErr_ChainExceptions1(exc);
chain_exceptions(PyExc_RuntimeError, "Failed to find the PyRuntime section in the process.");
}
#elif defined(__linux__)
// On Linux, search for 'python' in executable or DLL
address = search_linux_map_for_section(handle, "PyRuntime", "python");
if (address == 0) {
// Error out: 'python' substring covers both executable and DLL
PyObject *exc = PyErr_GetRaisedException();
PyErr_SetString(PyExc_RuntimeError, "Failed to find the PyRuntime section in the process.");
_PyErr_ChainExceptions1(exc);
chain_exceptions(PyExc_RuntimeError, "Failed to find the PyRuntime section in the process.");
}
#elif defined(__APPLE__) && TARGET_OS_OSX
// On macOS, try libpython first, then fall back to python
Expand Down
Loading