diff options
| author | Peter Zhu <[email protected]> | 2024-12-11 14:27:10 -0500 |
|---|---|---|
| committer | Peter Zhu <[email protected]> | 2024-12-12 14:07:56 -0500 |
| commit | 2da70aac258051d8a7eb89203e928a33727dbdf6 (patch) | |
| tree | 265db741825a12c7eb4a3cadf0b8b5e9d941bdf5 | |
| parent | ca2d19d4e5a47822c250179f88c814c5f401e9bd (diff) | |
Don't output memory map in crash report for ASAN
ASAN maps a large amount of memory, which makes the memory map section
massive.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12309
| -rw-r--r-- | vm_dump.c | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -1212,7 +1212,8 @@ rb_vm_bugreport(const void *ctx, FILE *errout) } { -#ifdef PROC_MAPS_NAME +#ifndef RUBY_ASAN_ENABLED +# ifdef PROC_MAPS_NAME { FILE *fp = fopen(PROC_MAPS_NAME, "r"); if (fp) { @@ -1229,9 +1230,9 @@ rb_vm_bugreport(const void *ctx, FILE *errout) kprintf("\n\n"); } } -#endif /* __linux__ */ -#ifdef HAVE_LIBPROCSTAT -# define MIB_KERN_PROC_PID_LEN 4 +# endif /* __linux__ */ +# ifdef HAVE_LIBPROCSTAT +# define MIB_KERN_PROC_PID_LEN 4 int mib[MIB_KERN_PROC_PID_LEN]; struct kinfo_proc kp; size_t len = sizeof(struct kinfo_proc); @@ -1249,8 +1250,8 @@ rb_vm_bugreport(const void *ctx, FILE *errout) procstat_close(prstat); kprintf("\n"); } -#endif /* __FreeBSD__ */ -#ifdef __APPLE__ +# endif /* __FreeBSD__ */ +# ifdef __APPLE__ vm_address_t addr = 0; vm_size_t size = 0; struct vm_region_submap_info map; @@ -1273,18 +1274,19 @@ rb_vm_bugreport(const void *ctx, FILE *errout) ((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 +# ifdef HAVE_LIBPROC_H char buff[PATH_MAX]; if (proc_regionfilename(getpid(), addr, buff, sizeof(buff)) > 0) { kprintf(" %s", buff); } -#endif +# endif kprintf("\n"); } addr += size; size = 0; } +# endif #endif } return true; |