Refactor CpuProfiler.

src/log.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/log.h"
 
 #include <cstdarg>
 #include <sstream>
 
 #include "src/bailout-reason.h"
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
 #include "src/counters.h"
 #include "src/deoptimizer.h"
 #include "src/global-handles.h"
 #include "src/interpreter/bytecodes.h"
 #include "src/interpreter/interpreter.h"
 #include "src/libsampler/v8-sampler.h"
 #include "src/log-inl.h"
 #include "src/log-utils.h"
 #include "src/macro-assembler.h"
 #include "src/perf-jit.h"
 #include "src/profiler/cpu-profiler-inl.h"
+#include "src/profiler/profiler-listener.h"
 #include "src/runtime-profiler.h"
 #include "src/string-stream.h"
 #include "src/vm-state-inl.h"
 
 namespace v8 {
 namespace internal {
 
 
 #define DECLARE_EVENT(ignore1, name) name,
 static const char* kLogEventsNames[CodeEventListener::NUMBER_OF_LOG_EVENTS] = {
@@ skipping 717 matching lines @@
       log_(new Log(this)),
       perf_basic_logger_(NULL),
       perf_jit_logger_(NULL),
       ll_logger_(NULL),
       jit_logger_(NULL),
       listeners_(5),
       is_initialized_(false) {}
 
 Logger::~Logger() {
   delete log_;
+  profiler_listener_.reset();

[alph, 2016/06/19 03:05:40]

nit: don't need this

[lpy, 2016/06/20 17:16:55]

Done.

 }
 
 void Logger::addCodeEventListener(CodeEventListener* listener) {
   bool result = isolate_->code_event_dispatcher()->AddListener(listener);
   USE(result);
   DCHECK(result);
 }
 
 void Logger::removeCodeEventListener(CodeEventListener* listener) {
   isolate_->code_event_dispatcher()->RemoveListener(listener);
@@ skipping 1010 matching lines @@
   }
 
   if (FLAG_log_internal_timer_events || FLAG_prof_cpp) timer_.Start();
 
   if (FLAG_prof_cpp) {
     profiler_ = new Profiler(isolate);
     is_logging_ = true;
     profiler_->Engage();
   }
 
+  profiler_listener_.reset();
+
   if (is_logging_) {
     addCodeEventListener(this);
   }
 
   return true;
 }
 
 
 void Logger::SetCodeEventHandler(uint32_t options,
                                  JitCodeEventHandler event_handler) {
   if (jit_logger_) {
       removeCodeEventListener(jit_logger_);
       delete jit_logger_;
       jit_logger_ = NULL;
   }
 
   if (event_handler) {
     jit_logger_ = new JitLogger(event_handler);
     addCodeEventListener(jit_logger_);
     if (options & kJitCodeEventEnumExisting) {
       HandleScope scope(isolate_);
       LogCodeObjects();
       LogCompiledFunctions();
     }
   }
 }
 
+void Logger::SetUpProfilerListener() {
+  if (!is_initialized_) return;
+  if (profiler_listener_.get()) {

[alph, 2016/06/19 03:05:40]

nit:
if (!listener)
  listener.reset(new ...);
addCodeEvent...

[lpy, 2016/06/20 17:16:55]

Done.

+    addCodeEventListener(profiler_listener_.get());
+    return;
+  }
+  profiler_listener_.reset(new ProfilerListener(isolate_));
+  addCodeEventListener(profiler_listener_.get());
+}
+
+void Logger::TearDownProfilerListener() {
+  if (profiler_listener_->HasObserver()) return;

[alph, 2016/06/19 03:05:40]

maybe DCHECK(!HasObserver);

[lpy, 2016/06/20 17:16:55]

The reason I don't put DCHECK here, is that I assume for one isolate, we have
one profiler listener and we can have many observers in it, each observer will
call TearDownProfilerListener at some point, so DCHECK is not the case.

I will leave this and check in the code. We can change it later.

+  removeCodeEventListener(profiler_listener_.get());
+}
 
 sampler::Sampler* Logger::sampler() {
   return ticker_;
 }
 
 
 FILE* Logger::TearDown() {
   if (!is_initialized_) return NULL;
   is_initialized_ = false;
 
@@ skipping 24 matching lines @@
     delete ll_logger_;
     ll_logger_ = NULL;
   }
 
   if (jit_logger_) {
     removeCodeEventListener(jit_logger_);
     delete jit_logger_;
     jit_logger_ = NULL;
   }
 
+  if (profiler_listener_.get()) {

[alph, 2016/06/19 03:05:40]

I believe it has an implicit conversion to bool.

[lpy, 2016/06/20 17:16:55]

Done.

+    removeCodeEventListener(profiler_listener_.get());
+  }
+
   return log_->Close();
 }
 
 }  // namespace internal
 }  // namespace v8