| Index: src/platform-win32.cc
|
| diff --git a/src/platform-win32.cc b/src/platform-win32.cc
|
| index b3ca40294d3de67b32464d7c933249d27276a199..f00d6b01b256da75211592df4fd9d40c434bbe30 100644
|
| --- a/src/platform-win32.cc
|
| +++ b/src/platform-win32.cc
|
| @@ -2010,24 +2010,13 @@ class SamplerThread : public Thread {
|
| SamplerRegistry::State state;
|
| while ((state = SamplerRegistry::GetState()) !=
|
| SamplerRegistry::HAS_NO_SAMPLERS) {
|
| - bool cpu_profiling_enabled =
|
| - (state == SamplerRegistry::HAS_CPU_PROFILING_SAMPLERS);
|
| - bool runtime_profiler_enabled = RuntimeProfiler::IsEnabled();
|
| // When CPU profiling is enabled both JavaScript and C++ code is
|
| // profiled. We must not suspend.
|
| - if (!cpu_profiling_enabled) {
|
| + if (state == SamplerRegistry::HAS_CPU_PROFILING_SAMPLERS) {
|
| + SamplerRegistry::IterateActiveSamplers(&DoCpuProfile, this);
|
| + } else {
|
| if (rate_limiter_.SuspendIfNecessary()) continue;
|
| }
|
| - if (cpu_profiling_enabled) {
|
| - if (!SamplerRegistry::IterateActiveSamplers(&DoCpuProfile, this)) {
|
| - return;
|
| - }
|
| - }
|
| - if (runtime_profiler_enabled) {
|
| - if (!SamplerRegistry::IterateActiveSamplers(&DoRuntimeProfile, NULL)) {
|
| - return;
|
| - }
|
| - }
|
| OS::Sleep(interval_);
|
| }
|
| }
|
| @@ -2040,11 +2029,6 @@ class SamplerThread : public Thread {
|
| sampler_thread->SampleContext(sampler);
|
| }
|
|
|
| - static void DoRuntimeProfile(Sampler* sampler, void* ignored) {
|
| - if (!sampler->isolate()->IsInitialized()) return;
|
| - sampler->isolate()->runtime_profiler()->NotifyTick();
|
| - }
|
| -
|
| void SampleContext(Sampler* sampler) {
|
| HANDLE profiled_thread = sampler->platform_data()->profiled_thread();
|
| if (profiled_thread == NULL) return;
|
|
|