From 7bfd80eb74096fc09aafa086efc6f05779ccb710 Mon Sep 17 00:00:00 2001 From: Lokesh Gidra Date: Mon, 13 Nov 2023 21:39:26 +0000 Subject: Initialialize jhp's 'enabled_' field Otherwise, with jemalloc, which doesn't memset(0), we wrongly enable the sampler, which makes allocations slower due to smaller TLABs. Also move IsEnabled() to the header file as it is invoked quite a few times while allocating TLAB. Bug: 310655393 Test: manual testing on devices using jemalloc Change-Id: I63e819488fb980db95080fa17400712bd8efdbe5 --- runtime/javaheapprof/javaheapsampler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/javaheapprof/javaheapsampler.h') diff --git a/runtime/javaheapprof/javaheapsampler.h b/runtime/javaheapprof/javaheapsampler.h index 618893cad0..41514726cd 100644 --- a/runtime/javaheapprof/javaheapsampler.h +++ b/runtime/javaheapprof/javaheapsampler.h @@ -68,7 +68,7 @@ class HeapSampler { // of new Tlab after Reset. void AdjustSampleOffset(size_t adjustment); // Is heap sampler enabled? - bool IsEnabled(); + bool IsEnabled() { return enabled_.load(std::memory_order_acquire); } // Set the sampling interval. void SetSamplingInterval(int sampling_interval) REQUIRES(!geo_dist_rng_lock_); // Return the sampling interval. @@ -80,7 +80,7 @@ class HeapSampler { // possibly decreasing sample intervals by sample_adj_bytes. size_t PickAndAdjustNextSample(size_t sample_adj_bytes = 0) REQUIRES(!geo_dist_rng_lock_); - std::atomic enabled_; + std::atomic enabled_{false}; // Default sampling interval is 4kb. // Writes guarded by geo_dist_rng_lock_. std::atomic p_sampling_interval_{4 * 1024}; -- cgit v1.2.3-59-g8ed1b