kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

crash report on mac little update

Browse source 
displaying vm info as Linux and FreeBSD.
checking libproc as it is present only from 10.5 version.

https://github.com/ruby/ruby/pull/2384
This commit is contained in:
David CARLIER 2019-08-19 09:36:28 +01:00 • committed by Nobuyoshi Nakada
parent 605d2ce9b9
commit 6dd9736c3a
2 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -2765,6 +2765,7 @@ AS_CASE(["$target_os"],
])
AS_CASE(["$target_cpu-$target_os"],
[*-darwin*], [
AC_CHECK_HEADERS([libproc.h])
AC_CHECK_HEADERS([execinfo.h])
AS_IF([test "x$ac_cv_header_execinfo_h" = xyes], [
AC_CHECK_LIB([execinfo], [backtrace])

45
vm_dump.c
View file

@ -16,6 +16,16 @@
#ifdef HAVE_UCONTEXT_H
#include <ucontext.h>
#endif
#ifdef __APPLE__
#ifdef HAVE_LIBPROC_H
#include <libproc.h>
#endif
#include <mach/vm_map.h>
#include <mach/mach_init.h>
#ifdef __LP64__
#define vm_region_recurse vm_region_recurse_64
#endif
#endif
/* see vm_insnhelper.h for the values */
#ifndef VMDEBUG
@ -984,6 +994,41 @@ rb_vm_bugreport(const void *ctx)
fprintf(stderr, "\n");
}
#endif /* __FreeBSD__ */
#ifdef __APPLE__
vm_address_t addr = 0;
vm_size_t size = 0;
struct vm_region_submap_info map;
mach_msg_type_number_t count = VM_REGION_SUBMAP_INFO_COUNT;
natural_t depth = 0;
fprintf(stderr, "* Process memory map:\n\n");
while (1) {
if (vm_region_recurse(mach_task_self(), &addr, &size, &depth,
(vm_region_recurse_info_t)&map, &count) != KERN_SUCCESS) {
break;
}
if (map.is_submap) {
// We only look at main addresses
depth++;
} else {
fprintf(stderr, "%lx-%lx %s%s%s", addr, (addr+size),
((map.protection & VM_PROT_READ) != 0 ? "r" : "-"),
((map.protection & VM_PROT_WRITE) != 0 ? "w" : "-"),
((map.protection & VM_PROT_EXECUTE) != 0 ? "x" : "-"));
#ifdef HAVE_LIBPROC_H
char buff[PATH_MAX];
if (proc_regionfilename(getpid(), addr, buff, sizeof(buff)) > 0) {
fprintf(stderr, " %s", buff);
}
#endif
fprintf(stderr, "\n");
}
addr += size;
size = 0;
}
#endif
}
}