Chromium Code Reviews| Index: base/profiler/stack_sampling_profiler_unittest.cc |
| diff --git a/base/profiler/stack_sampling_profiler_unittest.cc b/base/profiler/stack_sampling_profiler_unittest.cc |
| index 0b300d575d73c76f65a6afd7e53a372020a844a3..06390c211fc1d30ca617f5d664ca8481c45f5fbb 100644 |
| --- a/base/profiler/stack_sampling_profiler_unittest.cc |
| +++ b/base/profiler/stack_sampling_profiler_unittest.cc |
| @@ -374,6 +374,21 @@ void CaptureProfiles(const SamplingParams& params, TimeDelta profiler_wait_time, |
| }); |
| } |
| +// Waits for one of multiple samplings to complete. |
| +size_t WaitForSamplingComplete( |
| + std::vector<std::unique_ptr<WaitableEvent>>* sampling_completed) { |
| + // Map unique_ptrs to something that WaitMany can accept. |
| + std::vector<WaitableEvent*> sampling_completed_rawptrs( |
| + sampling_completed->size()); |
| + std::transform( |
| + sampling_completed->begin(), sampling_completed->end(), |
| + sampling_completed_rawptrs.begin(), |
| + [](const std::unique_ptr<WaitableEvent>& elem) { return elem.get(); }); |
| + // Wait for one profiler to finish. |
| + return WaitableEvent::WaitMany(sampling_completed_rawptrs.data(), |
| + sampling_completed_rawptrs.size()); |
| +} |
| + |
| // If this executable was linked with /INCREMENTAL (the default for non-official |
| // debug and release builds on Windows), function addresses do not correspond to |
| // function code itself, but instead to instructions in the Incremental Link |
| @@ -444,9 +459,9 @@ void TestLibraryUnload(bool wait_until_unloaded) { |
| StackCopiedSignaler(WaitableEvent* stack_copied, |
| WaitableEvent* start_stack_walk, |
| bool wait_to_walk_stack) |
| - : stack_copied_(stack_copied), start_stack_walk_(start_stack_walk), |
| - wait_to_walk_stack_(wait_to_walk_stack) { |
| - } |
| + : stack_copied_(stack_copied), |
| + start_stack_walk_(start_stack_walk), |
| + wait_to_walk_stack_(wait_to_walk_stack) {} |
| void OnPreStackWalk() override { |
| stack_copied_->Signal(); |
| @@ -720,35 +735,6 @@ TEST(StackSamplingProfilerTest, MAYBE_Alloca) { |
| << FormatSampleForDiagnosticOutput(sample, profile.modules); |
| } |
| -// Checks that the fire-and-forget interface works. |
| -#if defined(STACK_SAMPLING_PROFILER_SUPPORTED) |
| -#define MAYBE_StartAndRunAsync StartAndRunAsync |
| -#else |
| -#define MAYBE_StartAndRunAsync DISABLED_StartAndRunAsync |
| -#endif |
| -TEST(StackSamplingProfilerTest, MAYBE_StartAndRunAsync) { |
| - // StartAndRunAsync requires the caller to have a message loop. |
| - MessageLoop message_loop; |
| - |
| - SamplingParams params; |
| - params.samples_per_burst = 1; |
| - |
| - CallStackProfiles profiles; |
| - WithTargetThread([¶ms, &profiles](PlatformThreadId target_thread_id) { |
| - WaitableEvent sampling_thread_completed( |
| - WaitableEvent::ResetPolicy::AUTOMATIC, |
| - WaitableEvent::InitialState::NOT_SIGNALED); |
| - const StackSamplingProfiler::CompletedCallback callback = |
| - Bind(&SaveProfilesAndSignalEvent, Unretained(&profiles), |
| - Unretained(&sampling_thread_completed)); |
| - StackSamplingProfiler::StartAndRunAsync(target_thread_id, params, callback); |
| - RunLoop().RunUntilIdle(); |
| - sampling_thread_completed.Wait(); |
| - }); |
| - |
| - ASSERT_EQ(1u, profiles.size()); |
| -} |
| - |
| // Checks that the expected number of profiles and samples are present in the |
| // call stack profiles produced. |
| #if defined(STACK_SAMPLING_PROFILER_SUPPORTED) |
| @@ -860,6 +846,45 @@ TEST(StackSamplingProfilerTest, MAYBE_DestroyProfilerWhileProfiling) { |
| #define MAYBE_CanRunMultipleTimes DISABLED_CanRunMultipleTimes |
| #endif |
| TEST(StackSamplingProfilerTest, MAYBE_CanRunMultipleTimes) { |
| + StackSamplingProfiler::TestAPI::DisableIdleShutdown(); |
| + |
| + WithTargetThread([](PlatformThreadId target_thread_id) { |
| + SamplingParams params; |
| + params.sampling_interval = TimeDelta::FromMilliseconds(0); |
| + params.samples_per_burst = 1; |
| + |
| + CallStackProfiles profiles; |
| + WaitableEvent sampling_completed(WaitableEvent::ResetPolicy::MANUAL, |
| + WaitableEvent::InitialState::NOT_SIGNALED); |
| + const StackSamplingProfiler::CompletedCallback callback = |
| + Bind(&SaveProfilesAndSignalEvent, Unretained(&profiles), |
| + Unretained(&sampling_completed)); |
| + StackSamplingProfiler profiler(target_thread_id, params, callback); |
| + |
| + // Just start and stop to execute code paths. |
| + profiler.Start(); |
| + profiler.Stop(); |
| + sampling_completed.Wait(); |
| + |
| + // Ensure a second request will run and not block. |
| + sampling_completed.Reset(); |
| + profiles.clear(); |
| + profiler.Start(); |
| + sampling_completed.Wait(); |
| + profiler.Stop(); |
| + ASSERT_EQ(1u, profiles.size()); |
| + }); |
| +} |
| + |
| +// Checks that the different profilers may be run. |
| +#if defined(STACK_SAMPLING_PROFILER_SUPPORTED) |
| +#define MAYBE_CanRunMultipleProfilers CanRunMultipleProfilers |
| +#else |
| +#define MAYBE_CanRunMultipleProfilers DISABLED_CanRunMultipleProfilers |
| +#endif |
| +TEST(StackSamplingProfilerTest, MAYBE_CanRunMultipleProfilers) { |
| + StackSamplingProfiler::TestAPI::DisableIdleShutdown(); |
| + |
| SamplingParams params; |
| params.sampling_interval = TimeDelta::FromMilliseconds(0); |
| params.samples_per_burst = 1; |
| @@ -873,27 +898,62 @@ TEST(StackSamplingProfilerTest, MAYBE_CanRunMultipleTimes) { |
| ASSERT_EQ(1u, profiles.size()); |
| } |
| -// Checks that requests to start profiling while another profile is taking place |
| -// are ignored. |
| +// Checks that additional requests will restart a stopped profiler. |
| #if defined(STACK_SAMPLING_PROFILER_SUPPORTED) |
| -#define MAYBE_ConcurrentProfiling ConcurrentProfiling |
| +#define MAYBE_WillRestartSampler WillRestartSampler |
| #else |
| -#define MAYBE_ConcurrentProfiling DISABLED_ConcurrentProfiling |
| +#define MAYBE_WillRestartSampler DISABLED_WillRestartSampler |
| #endif |
| -TEST(StackSamplingProfilerTest, MAYBE_ConcurrentProfiling) { |
| +TEST(StackSamplingProfilerTest, MAYBE_WillRestartSampler) { |
| + StackSamplingProfiler::TestAPI::DisableIdleShutdown(); |
| + |
| + SamplingParams params; |
| + params.sampling_interval = TimeDelta::FromMilliseconds(0); |
| + params.samples_per_burst = 1; |
| + |
| + std::vector<CallStackProfile> profiles; |
| + CaptureProfiles(params, AVeryLongTimeDelta(), &profiles); |
| + ASSERT_EQ(1u, profiles.size()); |
| + |
| + // Capture thread should still be running at this point. |
| + ASSERT_TRUE(StackSamplingProfiler::TestAPI::IsSamplingThreadRunning()); |
| + |
| + // Initiate an "idle" shutdown. The task will be run immediately but on |
| + // another thread so wait for it to complete. |
| + StackSamplingProfiler::TestAPI::InitiateSamplingThreadIdleShutdown(); |
| + while (StackSamplingProfiler::TestAPI::IsSamplingThreadRunning()) |
| + PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(100)); |
| + |
| + // Ensure another capture will start the sampling thread and run. |
| + profiles.clear(); |
| + CaptureProfiles(params, AVeryLongTimeDelta(), &profiles); |
| + ASSERT_EQ(1u, profiles.size()); |
| + EXPECT_TRUE(StackSamplingProfiler::TestAPI::IsSamplingThreadRunning()); |
| +} |
| + |
| +// Checks that synchronized multiple sampling requests execute in parallel. |
| +#if defined(STACK_SAMPLING_PROFILER_SUPPORTED) |
| +#define MAYBE_ConcurrentProfiling_InSync ConcurrentProfiling_InSync |
| +#else |
| +#define MAYBE_ConcurrentProfiling_InSync DISABLED_ConcurrentProfiling_InSync |
| +#endif |
| +TEST(StackSamplingProfilerTest, MAYBE_ConcurrentProfiling_InSync) { |
|
Mike Wittman
2017/03/14 18:57:34
General comments on testing this functionality, no
bcwhite
2017/03/16 15:56:25
GetOrCreateTaskRunnerForAdd:
- state==RUNNING: tes
Mike Wittman
2017/03/18 01:38:41
Relying on existing tests is OK if the test is obv
bcwhite
2017/03/20 21:50:51
I've disabled the idle shutdown in those tests. 6
Mike Wittman
2017/03/21 16:50:38
To repeat:
Relying on existing tests is OK if the
bcwhite
2017/03/22 17:48:54
This IS the dedicated test! StopAfterIdleShutdown
Mike Wittman
2017/03/23 22:18:30
This is still pretty subtle and could use some eve
bcwhite
2017/03/27 17:52:43
Done.
Mike Wittman
2017/03/28 19:32:01
Please split this out into a dedicated test. It's
bcwhite
2017/03/29 14:56:57
That would be pretty much the same as StopDuringIn
Mike Wittman
2017/03/30 16:18:38
Yes. We might as well replace StopDuringInterSampl
bcwhite
2017/03/30 18:54:50
Done.
|
| WithTargetThread([](PlatformThreadId target_thread_id) { |
| SamplingParams params[2]; |
| params[0].initial_delay = TimeDelta::FromMilliseconds(10); |
| - params[0].sampling_interval = TimeDelta::FromMilliseconds(0); |
| - params[0].samples_per_burst = 1; |
| + params[0].sampling_interval = TimeDelta::FromMilliseconds(1); |
| + params[0].samples_per_burst = 9; |
| - params[1].sampling_interval = TimeDelta::FromMilliseconds(0); |
| - params[1].samples_per_burst = 1; |
| + params[1].initial_delay = TimeDelta::FromMilliseconds(11); |
| + params[1].sampling_interval = TimeDelta::FromMilliseconds(1); |
| + params[1].samples_per_burst = 8; |
| CallStackProfiles profiles[2]; |
| - std::vector<std::unique_ptr<WaitableEvent>> sampling_completed(2); |
| - std::vector<std::unique_ptr<StackSamplingProfiler>> profiler(2); |
| - for (int i = 0; i < 2; ++i) { |
| + std::vector<std::unique_ptr<WaitableEvent>> sampling_completed( |
| + arraysize(params)); |
| + std::vector<std::unique_ptr<StackSamplingProfiler>> profiler( |
| + arraysize(params)); |
| + for (size_t i = 0; i < arraysize(params); ++i) { |
| sampling_completed[i] = |
| MakeUnique<WaitableEvent>(WaitableEvent::ResetPolicy::AUTOMATIC, |
| WaitableEvent::InitialState::NOT_SIGNALED); |
| @@ -907,26 +967,169 @@ TEST(StackSamplingProfilerTest, MAYBE_ConcurrentProfiling) { |
| profiler[0]->Start(); |
| profiler[1]->Start(); |
| - std::vector<WaitableEvent*> sampling_completed_rawptrs( |
| - sampling_completed.size()); |
| - std::transform( |
| - sampling_completed.begin(), sampling_completed.end(), |
| - sampling_completed_rawptrs.begin(), |
| - [](const std::unique_ptr<WaitableEvent>& elem) { return elem.get(); }); |
| // Wait for one profiler to finish. |
| - size_t completed_profiler = |
| - WaitableEvent::WaitMany(sampling_completed_rawptrs.data(), 2); |
| + size_t completed_profiler = WaitForSamplingComplete(&sampling_completed); |
| EXPECT_EQ(1u, profiles[completed_profiler].size()); |
| size_t other_profiler = 1 - completed_profiler; |
| - // Give the other profiler a chance to run and observe that it hasn't. |
| - EXPECT_FALSE(sampling_completed[other_profiler]->TimedWait( |
| - TimeDelta::FromMilliseconds(25))); |
| - |
| - // Start the other profiler again and it should run. |
| - profiler[other_profiler]->Start(); |
| + // Wait for the other profiler to finish. |
| sampling_completed[other_profiler]->Wait(); |
| EXPECT_EQ(1u, profiles[other_profiler].size()); |
| + |
| + // Ensure each got the correct number of samples. |
| + EXPECT_EQ(9u, profiles[0][0].samples.size()); |
| + EXPECT_EQ(8u, profiles[1][0].samples.size()); |
| + }); |
| +} |
| + |
| +// Checks that interleaved multiple sampling requests execute in parallel. |
| +#if defined(STACK_SAMPLING_PROFILER_SUPPORTED) |
| +#define MAYBE_ConcurrentProfiling_Interleaved ConcurrentProfiling_Interleaved |
| +#else |
| +#define MAYBE_ConcurrentProfiling_Interleaved \ |
| + DISABLED_ConcurrentProfiling_Interleaved |
| +#endif |
| +TEST(StackSamplingProfilerTest, MAYBE_ConcurrentProfiling_Interleaved) { |
| + WithTargetThread([](PlatformThreadId target_thread_id) { |
| + SamplingParams params[2]; |
| + params[0].initial_delay = TimeDelta::FromMilliseconds(1); |
| + params[0].sampling_interval = TimeDelta::FromMilliseconds(2); |
| + params[0].samples_per_burst = 10; |
| + |
| + params[1].initial_delay = TimeDelta::FromMilliseconds(2); |
| + params[1].sampling_interval = TimeDelta::FromMilliseconds(2); |
| + params[1].samples_per_burst = 10; |
| + |
| + CallStackProfiles profiles[2]; |
| + std::vector<std::unique_ptr<WaitableEvent>> sampling_completed( |
| + arraysize(params)); |
| + std::vector<std::unique_ptr<StackSamplingProfiler>> profiler( |
| + arraysize(params)); |
| + for (size_t i = 0; i < arraysize(params); ++i) { |
| + sampling_completed[i] = |
| + MakeUnique<WaitableEvent>(WaitableEvent::ResetPolicy::AUTOMATIC, |
| + WaitableEvent::InitialState::NOT_SIGNALED); |
| + const StackSamplingProfiler::CompletedCallback callback = |
| + Bind(&SaveProfilesAndSignalEvent, Unretained(&profiles[i]), |
| + Unretained(sampling_completed[i].get())); |
| + profiler[i] = MakeUnique<StackSamplingProfiler>(target_thread_id, |
| + params[i], callback); |
| + } |
| + |
| + for (size_t i = 0; i < profiler.size(); ++i) |
| + profiler[i]->Start(); |
| + |
| + // Wait for one profiler to finish. |
| + size_t completed_profiler = WaitForSamplingComplete(&sampling_completed); |
| + EXPECT_EQ(1u, profiles[completed_profiler].size()); |
| + // Stop and destroy all profilers, always in the some order. Don't crash. |
|
Mike Wittman
2017/03/14 18:57:33
nit: same
bcwhite
2017/03/16 15:56:25
Done.
|
| + for (size_t i = 0; i < profiler.size(); ++i) |
| + profiler[i]->Stop(); |
| + for (size_t i = 0; i < profiler.size(); ++i) |
| + profiler[i].reset(); |
| + }); |
| +} |
| + |
| +// Checks that several mixed sampling requests execute in parallel. |
| +#if defined(STACK_SAMPLING_PROFILER_SUPPORTED) |
| +#define MAYBE_ConcurrentProfiling_Mixed ConcurrentProfiling_Mixed |
| +#else |
| +#define MAYBE_ConcurrentProfiling_Mixed DISABLED_ConcurrentProfiling_Mixed |
| +#endif |
| +TEST(StackSamplingProfilerTest, MAYBE_ConcurrentProfiling_Mixed) { |
| + WithTargetThread([](PlatformThreadId target_thread_id) { |
| + SamplingParams params[3]; |
| + params[0].initial_delay = TimeDelta::FromMilliseconds(8); |
| + params[0].sampling_interval = TimeDelta::FromMilliseconds(4); |
| + params[0].samples_per_burst = 10; |
| + |
| + params[1].initial_delay = TimeDelta::FromMilliseconds(9); |
| + params[1].sampling_interval = TimeDelta::FromMilliseconds(3); |
| + params[1].samples_per_burst = 10; |
| + |
| + params[2].initial_delay = TimeDelta::FromMilliseconds(10); |
| + params[2].sampling_interval = TimeDelta::FromMilliseconds(2); |
| + params[2].samples_per_burst = 10; |
| + |
| + CallStackProfiles profiles[arraysize(params)]; |
| + std::vector<std::unique_ptr<WaitableEvent>> sampling_completed( |
| + arraysize(params)); |
| + std::vector<std::unique_ptr<StackSamplingProfiler>> profiler( |
| + arraysize(params)); |
| + for (size_t i = 0; i < arraysize(params); ++i) { |
| + sampling_completed[i] = |
| + MakeUnique<WaitableEvent>(WaitableEvent::ResetPolicy::AUTOMATIC, |
| + WaitableEvent::InitialState::NOT_SIGNALED); |
| + const StackSamplingProfiler::CompletedCallback callback = |
| + Bind(&SaveProfilesAndSignalEvent, Unretained(&profiles[i]), |
| + Unretained(sampling_completed[i].get())); |
| + profiler[i] = MakeUnique<StackSamplingProfiler>(target_thread_id, |
| + params[i], callback); |
| + } |
| + |
| + for (size_t i = 0; i < profiler.size(); ++i) |
| + profiler[i]->Start(); |
| + |
| + // Wait for one profiler to finish. |
| + size_t completed_profiler = WaitForSamplingComplete(&sampling_completed); |
| + EXPECT_EQ(1u, profiles[completed_profiler].size()); |
| + // Stop and destroy all profilers, always in the some order. Don't crash. |
|
Mike Wittman
2017/03/14 18:57:34
nit: same
bcwhite
2017/03/16 15:56:25
Done.
|
| + for (size_t i = 0; i < profiler.size(); ++i) |
| + profiler[i].reset(); |
| + }); |
| +} |
| + |
| +// Checks that sampling requests execute in a staggered manner. |
| +#if defined(STACK_SAMPLING_PROFILER_SUPPORTED) |
| +#define MAYBE_ConcurrentProfiling_Staggered ConcurrentProfiling_Staggered |
| +#else |
| +#define MAYBE_ConcurrentProfiling_Staggered \ |
| + DISABLED_ConcurrentProfiling_Staggered |
| +#endif |
| +TEST(StackSamplingProfilerTest, MAYBE_ConcurrentProfiling_Staggered) { |
| + WithTargetThread([](PlatformThreadId target_thread_id) { |
| + SamplingParams params[3]; |
| + params[0].initial_delay = TimeDelta::FromMilliseconds(10); |
| + params[0].sampling_interval = TimeDelta::FromMilliseconds(10); |
| + params[0].samples_per_burst = 1; |
| + |
| + params[1].initial_delay = TimeDelta::FromMilliseconds(5); |
| + params[1].sampling_interval = TimeDelta::FromMilliseconds(10); |
| + params[1].samples_per_burst = 2; |
| + |
| + params[2].initial_delay = TimeDelta::FromMilliseconds(0); |
| + params[2].sampling_interval = TimeDelta::FromMilliseconds(10); |
| + params[2].samples_per_burst = 3; |
| + |
| + CallStackProfiles profiles[arraysize(params)]; |
| + std::vector<std::unique_ptr<WaitableEvent>> sampling_completed( |
| + arraysize(params)); |
| + std::vector<std::unique_ptr<StackSamplingProfiler>> profiler( |
| + arraysize(params)); |
| + for (size_t i = 0; i < arraysize(params); ++i) { |
| + sampling_completed[i] = |
| + MakeUnique<WaitableEvent>(WaitableEvent::ResetPolicy::AUTOMATIC, |
| + WaitableEvent::InitialState::NOT_SIGNALED); |
| + const StackSamplingProfiler::CompletedCallback callback = |
| + Bind(&SaveProfilesAndSignalEvent, Unretained(&profiles[i]), |
| + Unretained(sampling_completed[i].get())); |
| + profiler[i] = MakeUnique<StackSamplingProfiler>(target_thread_id, |
| + params[i], callback); |
| + } |
| + |
| + profiler[0]->Start(); |
| + profiler[1]->Start(); |
| + sampling_completed[0]->Wait(); |
| + EXPECT_FALSE(sampling_completed[1]->IsSignaled()); |
| + profiler[2]->Start(); |
| + profiler[0]->Stop(); |
| + profiler[1]->Stop(); |
| + sampling_completed[1]->Wait(); |
| + EXPECT_FALSE(sampling_completed[2]->IsSignaled()); |
| + sampling_completed[2]->Wait(); |
| + EXPECT_EQ(1u, profiles[0].size()); |
| + EXPECT_EQ(1u, profiles[1].size()); |
| + EXPECT_EQ(1u, profiles[2].size()); |
| }); |
| } |