[Isolates] Merge from bleeding_edge, revisions 5934-6100.

src/platform-macos.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 607 matching lines @@
         if (!SamplerRegistry::IterateActiveSamplers(&DoCpuProfile, this)) {
           return;
         }
       }
       if (runtime_profiler_enabled) {
         if (!SamplerRegistry::IterateActiveSamplers(&DoRuntimeProfile, NULL)) {
           return;
         }
       }
       OS::Sleep(interval_);
+      state = SamplerRegistry::GetState();
     }
   }
 
   static void DoCpuProfile(Sampler* sampler, void* raw_sampler_thread) {
     if (!sampler->IsProfiling()) return;
     SamplerThread* sampler_thread =
         reinterpret_cast<SamplerThread*>(raw_sampler_thread);
     sampler_thread->SampleContext(sampler);
   }
 
@@ skipping 88 matching lines @@
 
 void Sampler::Stop() {
   ASSERT(IsActive());
   SamplerThread::RemoveActiveSampler(this);
   SetActive(false);
 }
 
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 } }  // namespace v8::internal