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

src/log.cc

 // Copyright 2009 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 163 matching lines @@
     it.Advance();
   }
   sample->frames_count = i;
 }
 
 
 //
 // Ticker used to provide ticks to the profiler and the sliding state
 // window.
 //
-#ifndef ENABLE_CPP_PROFILES_PROCESSOR
-
 class Ticker: public Sampler {
  public:
   explicit Ticker(int interval):
       Sampler(interval, FLAG_prof), window_(NULL), profiler_(NULL) {}
 
   ~Ticker() { if (IsActive()) Stop(); }
 
   void SampleStack(TickSample* sample) {
     StackTracer::Trace(sample);
   }
@@ skipping 21 matching lines @@
   void ClearProfiler() {
     profiler_ = NULL;
     if (!window_ && IsActive()) Stop();
   }
 
  private:
   SlidingStateWindow* window_;
   Profiler* profiler_;
 };
 
-#endif  // ENABLE_CPP_PROFILES_PROCESSOR
-
 
 //
 // SlidingStateWindow implementation.
 //
 SlidingStateWindow::SlidingStateWindow(): current_index_(0), is_full_(false) {
   for (int i = 0; i < kBufferSize; i++) {
     buffer_[i] = static_cast<byte>(OTHER);
   }
   Logger::ticker_->SetWindow(this);
 }
@@ skipping 1262 matching lines @@
     if (!FLAG_prof_auto) {
       profiler_->pause();
     } else {
       logging_nesting_ = 1;
     }
     if (!FLAG_prof_lazy) {
       profiler_->Engage();
     }
   }
 
-#ifdef ENABLE_CPP_PROFILES_PROCESSOR
-  // Disable old logging, as we are using the same '--prof' flag.
-  logging_nesting_ = 0;
-#endif
-
   LogMessageBuilder::set_write_failure_handler(StopLoggingAndProfiling);
 
   return true;
 
 #else
   return false;
 #endif
 }
 
 
@@ skipping 34 matching lines @@
   }
   // Otherwise, if the sliding state window computation has not been
   // started we do it now.
   if (sliding_state_window_ == NULL) {
     sliding_state_window_ = new SlidingStateWindow();
   }
 #endif
 }
 
 } }  // namespace v8::internal