From bf2a7d0f0bcb0438f342b304988115f3c88a2178 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Sep 2021 15:21:17 -0700 Subject: [PATCH] Fix sample profiler resolution on Windows. (#59056) If sample profiler was initially created before sampling has been enabled, happens when setting up sessions during startup, sample_profiler_load_dependecies won't get called, meaning we won't setup timeBeginPeriod/timeEndPeriod on Windows, and won't adjust default scheduling resolution to 1ms staying on default 16ms. There is a ref count check in current sample_profiler_enable checking if we should call sample_profiler_load_dependecies (_ref_count == 0), but in case where we can't start profiling _can_start_sampling == false, we won't call sample_profiler_enable but always increase _ref_count that in turn will prevent calls to sample_profiler_load_dependecies when enabling sample profiler and that in turn won't call timeBeginPeriod staying on default scheduling resolution. Fix is to always call sample_profiler_load_dependecies making sure we will setup needed dependencies when _ref_count == 0. Co-authored-by: lateralusX --- src/native/eventpipe/ep-sample-profiler.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/native/eventpipe/ep-sample-profiler.c b/src/native/eventpipe/ep-sample-profiler.c index 858d69a..2414872 100644 --- a/src/native/eventpipe/ep-sample-profiler.c +++ b/src/native/eventpipe/ep-sample-profiler.c @@ -198,10 +198,7 @@ sample_profiler_enable (void) ep_requires_lock_held (); - const bool result = sample_profiler_load_dependecies (); - EP_ASSERT (result); - - if (result && !sample_profiler_load_profiling_enabled ()) { + if (!sample_profiler_load_profiling_enabled ()) { sample_profiler_store_profiling_enabled (true); EP_ASSERT (!ep_rt_wait_event_is_valid (&_thread_shutdown_event)); @@ -273,6 +270,8 @@ ep_sample_profiler_enable (void) if (!ep_event_is_enabled (_thread_time_event)) return; + sample_profiler_load_dependecies (); + if (_can_start_sampling) sample_profiler_enable (); -- 2.7.4