Allow new CPU profiling subsystem to coexist nicely with the old one.

src/cpu-profiler.cc

 // Copyright 2010 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 265 matching lines @@
 }
 
 
 CpuProfile* CpuProfiler::FindProfile(unsigned uid) {
   ASSERT(singleton_ != NULL);
   return singleton_->profiles_->GetProfile(uid);
 }
 
 
 TickSample* CpuProfiler::TickSampleEvent() {
-  ASSERT(singleton_ != NULL);
-  if (singleton_->is_profiling()) {
+  if (CpuProfiler::is_profiling()) {
     return singleton_->processor_->TickSampleEvent();
   } else {
     return NULL;
   }
 }
 
 
 void CpuProfiler::CallbackEvent(String* name, Address entry_point) {
   singleton_->processor_->CallbackCreateEvent(
       Logger::CALLBACK_TAG, CodeEntry::kEmptyNamePrefix, name, entry_point);
@@ skipping 112 matching lines @@
 
 void CpuProfiler::StartCollectingProfile(String* title) {
   if (profiles_->StartProfiling(title, next_profile_uid_++)) {
     StartProcessorIfNotStarted();
   }
 }
 
 
 void CpuProfiler::StartProcessorIfNotStarted() {
   if (processor_ == NULL) {
+    // Disable logging when using the new implementation.
+    saved_logging_nesting_ = Logger::logging_nesting_;
+    Logger::logging_nesting_ = 0;
     generator_ = new ProfileGenerator(profiles_);
     processor_ = new ProfilerEventsProcessor(generator_);
     processor_->Start();
     // Enumerate stuff we already have in the heap.
     if (Heap::HasBeenSetup()) {
       Logger::LogCodeObjects();
       Logger::LogCompiledFunctions();
       Logger::LogFunctionObjects();
       Logger::LogAccessorCallbacks();
     }
     // Enable stack sampling.
-    Logger::ticker_->Start();
+    reinterpret_cast<Sampler*>(Logger::ticker_)->Start();
   }
 }
 
 
 CpuProfile* CpuProfiler::StopCollectingProfile(const char* title) {
   StopProcessorIfLastProfile();
   CpuProfile* result = profiles_->StopProfiling(title);
   if (result != NULL) {
     result->Print();
   }
   return result;
 }
 
 
 CpuProfile* CpuProfiler::StopCollectingProfile(String* title) {
   StopProcessorIfLastProfile();
   return profiles_->StopProfiling(title);
 }
 
 
 void CpuProfiler::StopProcessorIfLastProfile() {
   if (profiles_->is_last_profile()) {
-    Logger::ticker_->Stop();
+    reinterpret_cast<Sampler*>(Logger::ticker_)->Stop();
     processor_->Stop();
     processor_->Join();
     delete processor_;
     delete generator_;
     processor_ = NULL;
     generator_ = NULL;
+    Logger::logging_nesting_ = saved_logging_nesting_;
   }
 }
 
 } }  // namespace v8::internal
 
 #endif  // ENABLE_CPP_PROFILES_PROCESSOR
 
 namespace v8 {
 namespace internal {
 
 void CpuProfiler::Setup() {
 #ifdef ENABLE_CPP_PROFILES_PROCESSOR
   if (singleton_ == NULL) {
     singleton_ = new CpuProfiler();
   }
 #endif
 }
 
 
 void CpuProfiler::TearDown() {
 #ifdef ENABLE_CPP_PROFILES_PROCESSOR
   if (singleton_ != NULL) {
     delete singleton_;
   }
   singleton_ = NULL;
 #endif
 }
 
 } }  // namespace v8::internal