mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Pablo Galindo Salgado 2025-04-23 18:23:24 +01:00 committed by GitHub
parent c9bc458d30
commit 1007aab133
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Python/traceback.c
View File

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