Skip to content

gh-127604: Allow faulthandler to dumpC stack on MacOS #132841

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
merged 2 commits into from
Apr 23, 2025
+20 −3
Merged

gh-127604: Allow faulthandler to dumpC stack on MacOS #132841

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75e05b8
gh-127604: Allow faulthandler to dumpC stack on MacOS
pablogsal Apr 23, 2025
84175cf
Apply suggestions from code review
pablogsal Apr 23, 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
23 changes: 20 additions & 3 deletions Python/traceback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,24 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h> // lseek()
#endif
#if defined(HAVE_EXECINFO_H) && defined(HAVE_DLFCN_H) && defined(HAVE_LINK_H)

#if (defined(HAVE_EXECINFO_H) && defined(HAVE_DLFCN_H) && defined(HAVE_LINK_H))
# define _PY_HAS_BACKTRACE_HEADERS 1
#endif

#if (defined(__APPLE__) && defined(HAVE_EXECINFO_H) && defined(HAVE_DLFCN_H))
# define _PY_HAS_BACKTRACE_HEADERS 1
#endif

#ifdef _PY_HAS_BACKTRACE_HEADERS
# include <execinfo.h> // backtrace(), backtrace_symbols()
# include <dlfcn.h> // dladdr1()
# include <link.h> // struct DL_info
# if defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS) && defined(HAVE_DLADDR1)
#ifdef HAVE_LINK_H
# include <link.h> // struct DL_info
#endif
# if defined(__APPLE__) && defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS) && defined(HAVE_DLADDR)
# define CAN_C_BACKTRACE
# elif defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS) && defined(HAVE_DLADDR1)
# define CAN_C_BACKTRACE
# endif
#endif
Expand Down Expand Up @@ -1193,6 +1206,9 @@ _Py_backtrace_symbols_fd(int fd, void *const *array, Py_ssize_t size)
VLA(int, status, size);
/* Fill in the information we can get from dladdr() */
for (Py_ssize_t i = 0; i < size; ++i) {
#ifdef __APPLE__
status[i] = dladdr(array[i], &info[i]);
#else
struct link_map *map;
status[i] = dladdr1(array[i], &info[i], (void **)&map, RTLD_DL_LINKMAP);
if (status[i] != 0
Expand All @@ -1204,6 +1220,7 @@ _Py_backtrace_symbols_fd(int fd, void *const *array, Py_ssize_t size)
something we want to subtract out */
info[i].dli_fbase = (void *) map->l_addr;
}
#endif
}
for (Py_ssize_t i = 0; i < size; ++i) {
if (status[i] == 0
Expand Down
Loading