From ff8062a511f2f3e727891c21238d98c6757ee27e Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Tue, 30 May 2017 14:26:02 -0700 Subject: [PATCH] Add jemalloc prefix to allocator functions pruned by jeprof. This resolves #507. --- bin/jeprof.in | 26 +++++++++++++------------- configure.ac | 1 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/bin/jeprof.in b/bin/jeprof.in index baa80a54..e6f4af4b 100644 --- a/bin/jeprof.in +++ b/bin/jeprof.in @@ -2892,21 +2892,21 @@ sub RemoveUninterestingFrames { my %skip = (); my $skip_regexp = 'NOMATCH'; if ($main::profile_type eq 'heap' || $main::profile_type eq 'growth') { - foreach my $name ('calloc', + foreach my $name ('@JEMALLOC_PREFIX@calloc', 'cfree', - 'malloc', - 'free', - 'memalign', - 'posix_memalign', - 'aligned_alloc', + '@JEMALLOC_PREFIX@malloc', + '@JEMALLOC_PREFIX@free', + '@JEMALLOC_PREFIX@memalign', + '@JEMALLOC_PREFIX@posix_memalign', + '@JEMALLOC_PREFIX@aligned_alloc', 'pvalloc', - 'valloc', - 'realloc', - 'mallocx', # jemalloc - 'rallocx', # jemalloc - 'xallocx', # jemalloc - 'dallocx', # jemalloc - 'sdallocx', # jemalloc + '@JEMALLOC_PREFIX@valloc', + '@JEMALLOC_PREFIX@realloc', + '@JEMALLOC_PREFIX@mallocx', + '@JEMALLOC_PREFIX@rallocx', + '@JEMALLOC_PREFIX@xallocx', + '@JEMALLOC_PREFIX@dallocx', + '@JEMALLOC_PREFIX@sdallocx', 'tc_calloc', 'tc_cfree', 'tc_malloc', diff --git a/configure.ac b/configure.ac index bed01b7a..a00aab9b 100644 --- a/configure.ac +++ b/configure.ac @@ -802,6 +802,7 @@ else AC_DEFINE_UNQUOTED([JEMALLOC_PREFIX], ["$JEMALLOC_PREFIX"]) AC_DEFINE_UNQUOTED([JEMALLOC_CPREFIX], ["$JEMALLOC_CPREFIX"]) fi +AC_SUBST([JEMALLOC_PREFIX]) AC_SUBST([JEMALLOC_CPREFIX]) AC_ARG_WITH([export],