diff --git a/include/jemalloc/internal/prof_externs.h b/include/jemalloc/internal/prof_externs.h index f03ef74b..8c657c63 100644 --- a/include/jemalloc/internal/prof_externs.h +++ b/include/jemalloc/internal/prof_externs.h @@ -48,9 +48,6 @@ extern size_t lg_prof_sample; extern bool prof_booted; -/* Functions only accessed in prof_inlines_a.h */ -bool prof_idump_accum_impl(tsdn_t *tsdn, uint64_t accumbytes); - /* Functions only accessed in prof_inlines_b.h */ prof_tdata_t *prof_tdata_init(tsd_t *tsd); prof_tdata_t *prof_tdata_reinit(tsd_t *tsd, prof_tdata_t *tdata); @@ -78,6 +75,7 @@ void prof_cnt_all(uint64_t *curobjs, uint64_t *curbytes, uint64_t *accumobjs, int prof_getpid(void); void prof_get_default_filename(tsdn_t *tsdn, char *filename, uint64_t ind); bool prof_accum_init(void); +bool prof_idump_accum(tsdn_t *tsdn, uint64_t accumbytes); void prof_idump(tsdn_t *tsdn); bool prof_mdump(tsd_t *tsd, const char *filename); void prof_gdump(tsdn_t *tsdn); diff --git a/include/jemalloc/internal/prof_inlines_a.h b/include/jemalloc/internal/prof_inlines_a.h index 63d429e3..4450b1d3 100644 --- a/include/jemalloc/internal/prof_inlines_a.h +++ b/include/jemalloc/internal/prof_inlines_a.h @@ -25,15 +25,4 @@ prof_active_get_unlocked(void) { return prof_active; } -JEMALLOC_ALWAYS_INLINE bool -prof_idump_accum(tsdn_t *tsdn, uint64_t accumbytes) { - cassert(config_prof); - - if (prof_interval == 0 || !prof_active_get_unlocked()) { - return false; - } - - return prof_idump_accum_impl(tsdn, accumbytes); -} - #endif /* JEMALLOC_INTERNAL_PROF_INLINES_A_H */ diff --git a/src/prof.c b/src/prof.c index 9c1fc2a6..ff09a5d7 100644 --- a/src/prof.c +++ b/src/prof.c @@ -649,9 +649,13 @@ prof_accum_init(void) { } bool -prof_idump_accum_impl(tsdn_t *tsdn, uint64_t accumbytes) { +prof_idump_accum(tsdn_t *tsdn, uint64_t accumbytes) { cassert(config_prof); + if (prof_interval == 0 || !prof_active_get_unlocked()) { + return false; + } + return counter_accum(tsdn, &prof_idump_accumulated, accumbytes); }