Refactor CpuProfiler.

src/profiler/profiler-listener.cc

-// Copyright 2012 the V8 project authors. All rights reserved.
+// Copyright 2016 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/profiler/profiler-listener.h"
+
+#include "src/deoptimizer.h"
+#include "src/interpreter/source-position-table.h"
 #include "src/profiler/cpu-profiler.h"
-
-#include "src/debug/debug.h"
-#include "src/deoptimizer.h"
-#include "src/frames-inl.h"
-#include "src/locked-queue-inl.h"
-#include "src/log-inl.h"
-#include "src/profiler/cpu-profiler-inl.h"
-#include "src/vm-state-inl.h"
-
-#include "include/v8-profiler.h"
+#include "src/profiler/profile-generator-inl.h"
 
 namespace v8 {
 namespace internal {
 
-static const int kProfilerStackSize = 64 * KB;
-
-
-ProfilerEventsProcessor::ProfilerEventsProcessor(ProfileGenerator* generator,
-                                                 sampler::Sampler* sampler,
-                                                 base::TimeDelta period)
-    : Thread(Thread::Options("v8:ProfEvntProc", kProfilerStackSize)),
-      generator_(generator),
-      sampler_(sampler),
-      running_(1),
-      period_(period),
-      last_code_event_id_(0),
-      last_processed_code_event_id_(0) {}
-
-
-ProfilerEventsProcessor::~ProfilerEventsProcessor() {}
-
-
-void ProfilerEventsProcessor::Enqueue(const CodeEventsContainer& event) {
-  event.generic.order = last_code_event_id_.Increment(1);
-  events_buffer_.Enqueue(event);
+ProfilerListener::ProfilerListener(Isolate* isolate)
+    : isolate_(isolate),
+      function_and_resource_names_(isolate->heap()),
+      is_building_code_entry_(false) {
+  bool result = isolate_->code_event_dispatcher()->AddListener(this);

[alph, 2016/06/17 10:38:44]

I can't find where you remove the listener.

[lpy, 2016/06/17 13:55:00]

Done.

+  USE(result);
+  DCHECK(result);
 }
 
-
-void ProfilerEventsProcessor::AddDeoptStack(Isolate* isolate, Address from,
-                                            int fp_to_sp_delta) {
-  TickSampleEventRecord record(last_code_event_id_.Value());
-  RegisterState regs;
-  Address fp = isolate->c_entry_fp(isolate->thread_local_top());
-  regs.sp = fp - fp_to_sp_delta;
-  regs.fp = fp;
-  regs.pc = from;
-  record.sample.Init(isolate, regs, TickSample::kSkipCEntryFrame, false);
-  ticks_from_vm_buffer_.Enqueue(record);
-}
-
-void ProfilerEventsProcessor::AddCurrentStack(Isolate* isolate,
-                                              bool update_stats) {
-  TickSampleEventRecord record(last_code_event_id_.Value());
-  RegisterState regs;
-  StackFrameIterator it(isolate);
-  if (!it.done()) {
-    StackFrame* frame = it.frame();
-    regs.sp = frame->sp();
-    regs.fp = frame->fp();
-    regs.pc = frame->pc();
-  }
-  record.sample.Init(isolate, regs, TickSample::kSkipCEntryFrame, update_stats);
-  ticks_from_vm_buffer_.Enqueue(record);
-}
-
-
-void ProfilerEventsProcessor::StopSynchronously() {
-  if (!base::NoBarrier_AtomicExchange(&running_, 0)) return;
-  Join();
-}
-
-
-bool ProfilerEventsProcessor::ProcessCodeEvent() {
-  CodeEventsContainer record;
-  if (events_buffer_.Dequeue(&record)) {
-    switch (record.generic.type) {
-#define PROFILER_TYPE_CASE(type, clss)                          \
-      case CodeEventRecord::type:                               \
-        record.clss##_.UpdateCodeMap(generator_->code_map());   \
-        break;
-
-      CODE_EVENTS_TYPE_LIST(PROFILER_TYPE_CASE)
-
-#undef PROFILER_TYPE_CASE
-      default: return true;  // Skip record.
-    }
-    last_processed_code_event_id_ = record.generic.order;
-    return true;
-  }
-  return false;
-}
-
-ProfilerEventsProcessor::SampleProcessingResult
-    ProfilerEventsProcessor::ProcessOneSample() {
-  TickSampleEventRecord record1;
-  if (ticks_from_vm_buffer_.Peek(&record1) &&
-      (record1.order == last_processed_code_event_id_)) {
-    TickSampleEventRecord record;
-    ticks_from_vm_buffer_.Dequeue(&record);
-    generator_->RecordTickSample(record.sample);
-    return OneSampleProcessed;
-  }
-
-  const TickSampleEventRecord* record = ticks_buffer_.Peek();
-  if (record == NULL) {
-    if (ticks_from_vm_buffer_.IsEmpty()) return NoSamplesInQueue;
-    return FoundSampleForNextCodeEvent;
-  }
-  if (record->order != last_processed_code_event_id_) {
-    return FoundSampleForNextCodeEvent;
-  }
-  generator_->RecordTickSample(record->sample);
-  ticks_buffer_.Remove();
-  return OneSampleProcessed;
-}
-
-
-void ProfilerEventsProcessor::Run() {
-  while (!!base::NoBarrier_Load(&running_)) {
-    base::TimeTicks nextSampleTime =
-        base::TimeTicks::HighResolutionNow() + period_;
-    base::TimeTicks now;
-    SampleProcessingResult result;
-    // Keep processing existing events until we need to do next sample
-    // or the ticks buffer is empty.
-    do {
-      result = ProcessOneSample();
-      if (result == FoundSampleForNextCodeEvent) {
-        // All ticks of the current last_processed_code_event_id_ are
-        // processed, proceed to the next code event.
-        ProcessCodeEvent();
-      }
-      now = base::TimeTicks::HighResolutionNow();
-    } while (result != NoSamplesInQueue && now < nextSampleTime);
-
-    if (nextSampleTime > now) {
-#if V8_OS_WIN
-      // Do not use Sleep on Windows as it is very imprecise.
-      // Could be up to 16ms jitter, which is unacceptable for the purpose.
-      while (base::TimeTicks::HighResolutionNow() < nextSampleTime) {
-      }
-#else
-      base::OS::Sleep(nextSampleTime - now);
-#endif
-    }
-
-    // Schedule next sample. sampler_ is NULL in tests.
-    if (sampler_) sampler_->DoSample();
-  }
-
-  // Process remaining tick events.
-  do {
-    SampleProcessingResult result;
-    do {
-      result = ProcessOneSample();
-    } while (result == OneSampleProcessed);
-  } while (ProcessCodeEvent());
-}
-
-
-void* ProfilerEventsProcessor::operator new(size_t size) {
-  return AlignedAlloc(size, V8_ALIGNOF(ProfilerEventsProcessor));
-}
-
-
-void ProfilerEventsProcessor::operator delete(void* ptr) {
-  AlignedFree(ptr);
-}
-
-
-int CpuProfiler::GetProfilesCount() {
-  // The count of profiles doesn't depend on a security token.
-  return profiles_->profiles()->length();
-}
-
-
-CpuProfile* CpuProfiler::GetProfile(int index) {
-  return profiles_->profiles()->at(index);
-}
-
-
-void CpuProfiler::DeleteAllProfiles() {
-  if (is_profiling_) StopProcessor();
-  ResetProfiles();
-}
-
-
-void CpuProfiler::DeleteProfile(CpuProfile* profile) {
-  profiles_->RemoveProfile(profile);
-  delete profile;
-  if (profiles_->profiles()->is_empty() && !is_profiling_) {
-    // If this was the last profile, clean up all accessory data as well.
-    ResetProfiles();
+ProfilerListener::~ProfilerListener() {
+  for (auto it = code_entries_.begin(); it != code_entries_.end(); ++it) {

[alph, 2016/06/17 10:38:44]

nit: for (auto entry : code_entries_)

[lpy, 2016/06/17 13:55:00]

Done.

+    delete *it;
   }
 }
 
-
-void CpuProfiler::CallbackEvent(Name* name, Address entry_point) {
+void ProfilerListener::CallbackEvent(Name* name, Address entry_point) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = entry_point;
-  rec->entry = profiles_->NewCodeEntry(CodeEventListener::CALLBACK_TAG,
-                                       profiles_->GetName(name));
+  rec->entry = NewCodeEntry(CodeEventListener::CALLBACK_TAG, GetName(name));
   rec->size = 1;
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
-                                  AbstractCode* code, const char* name) {
+void ProfilerListener::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
+                                       AbstractCode* code, const char* name) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = code->address();
-  rec->entry = profiles_->NewCodeEntry(
-      tag, profiles_->GetFunctionName(name), CodeEntry::kEmptyNamePrefix,
+  rec->entry = NewCodeEntry(
+      tag, GetFunctionName(name), CodeEntry::kEmptyNamePrefix,
       CodeEntry::kEmptyResourceName, CpuProfileNode::kNoLineNumberInfo,
       CpuProfileNode::kNoColumnNumberInfo, NULL, code->instruction_start());
   RecordInliningInfo(rec->entry, code);
   rec->size = code->ExecutableSize();
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
-                                  AbstractCode* code, Name* name) {
+void ProfilerListener::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
+                                       AbstractCode* code, Name* name) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = code->address();
-  rec->entry = profiles_->NewCodeEntry(
-      tag, profiles_->GetFunctionName(name), CodeEntry::kEmptyNamePrefix,
+  rec->entry = NewCodeEntry(
+      tag, GetFunctionName(name), CodeEntry::kEmptyNamePrefix,
       CodeEntry::kEmptyResourceName, CpuProfileNode::kNoLineNumberInfo,
       CpuProfileNode::kNoColumnNumberInfo, NULL, code->instruction_start());
   RecordInliningInfo(rec->entry, code);
   rec->size = code->ExecutableSize();
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
-                                  AbstractCode* code,
-                                  SharedFunctionInfo* shared,
-                                  Name* script_name) {
+void ProfilerListener::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
+                                       AbstractCode* code,
+                                       SharedFunctionInfo* shared,
+                                       Name* script_name) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = code->address();
-  rec->entry = profiles_->NewCodeEntry(
-      tag, profiles_->GetFunctionName(shared->DebugName()),
-      CodeEntry::kEmptyNamePrefix,
-      profiles_->GetName(InferScriptName(script_name, shared)),
+  rec->entry = NewCodeEntry(
+      tag, GetFunctionName(shared->DebugName()), CodeEntry::kEmptyNamePrefix,
+      GetName(InferScriptName(script_name, shared)),
       CpuProfileNode::kNoLineNumberInfo, CpuProfileNode::kNoColumnNumberInfo,
       NULL, code->instruction_start());
   RecordInliningInfo(rec->entry, code);
   rec->entry->FillFunctionInfo(shared);
   rec->size = code->ExecutableSize();
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
-                                  AbstractCode* abstract_code,
-                                  SharedFunctionInfo* shared, Name* script_name,
-                                  int line, int column) {
+void ProfilerListener::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
+                                       AbstractCode* abstract_code,
+                                       SharedFunctionInfo* shared,
+                                       Name* script_name, int line,
+                                       int column) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = abstract_code->address();
   Script* script = Script::cast(shared->script());
   JITLineInfoTable* line_table = NULL;
   if (script) {
     if (abstract_code->IsCode()) {
       Code* code = abstract_code->GetCode();
       int start_position = shared->start_position();
       int end_position = shared->end_position();
@@ skipping 18 matching lines @@
       line_table = new JITLineInfoTable();
       interpreter::SourcePositionTableIterator it(
           bytecode->source_position_table());
       for (; !it.done(); it.Advance()) {
         int line_number = script->GetLineNumber(it.source_position()) + 1;
         int pc_offset = it.bytecode_offset() + BytecodeArray::kHeaderSize;
         line_table->SetPosition(pc_offset, line_number);
       }
     }
   }
-  rec->entry = profiles_->NewCodeEntry(
-      tag, profiles_->GetFunctionName(shared->DebugName()),
-      CodeEntry::kEmptyNamePrefix,
-      profiles_->GetName(InferScriptName(script_name, shared)), line, column,
-      line_table, abstract_code->instruction_start());
+  rec->entry = NewCodeEntry(
+      tag, GetFunctionName(shared->DebugName()), CodeEntry::kEmptyNamePrefix,
+      GetName(InferScriptName(script_name, shared)), line, column, line_table,
+      abstract_code->instruction_start());
   RecordInliningInfo(rec->entry, abstract_code);
   RecordDeoptInlinedFrames(rec->entry, abstract_code);
   rec->entry->FillFunctionInfo(shared);
   rec->size = abstract_code->ExecutableSize();
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
-                                  AbstractCode* code, int args_count) {
+void ProfilerListener::CodeCreateEvent(CodeEventListener::LogEventsAndTags tag,
+                                       AbstractCode* code, int args_count) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = code->address();
-  rec->entry = profiles_->NewCodeEntry(
-      tag, profiles_->GetName(args_count), "args_count: ",
-      CodeEntry::kEmptyResourceName, CpuProfileNode::kNoLineNumberInfo,
-      CpuProfileNode::kNoColumnNumberInfo, NULL, code->instruction_start());
+  rec->entry = NewCodeEntry(
+      tag, GetName(args_count), "args_count: ", CodeEntry::kEmptyResourceName,
+      CpuProfileNode::kNoLineNumberInfo, CpuProfileNode::kNoColumnNumberInfo,
+      NULL, code->instruction_start());
   RecordInliningInfo(rec->entry, code);
   rec->size = code->ExecutableSize();
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::CodeMoveEvent(AbstractCode* from, Address to) {
+void ProfilerListener::CodeMoveEvent(AbstractCode* from, Address to) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_MOVE);
   CodeMoveEventRecord* rec = &evt_rec.CodeMoveEventRecord_;
   rec->from = from->address();
   rec->to = to;
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::CodeDisableOptEvent(AbstractCode* code,
-                                      SharedFunctionInfo* shared) {
+void ProfilerListener::CodeDisableOptEvent(AbstractCode* code,
+                                           SharedFunctionInfo* shared) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_DISABLE_OPT);
   CodeDisableOptEventRecord* rec = &evt_rec.CodeDisableOptEventRecord_;
   rec->start = code->address();
   rec->bailout_reason = GetBailoutReason(shared->disable_optimization_reason());
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::CodeDeoptEvent(Code* code, Address pc, int fp_to_sp_delta) {
+void ProfilerListener::CodeDeoptEvent(Code* code, Address pc,
+                                      int fp_to_sp_delta) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_DEOPT);
   CodeDeoptEventRecord* rec = &evt_rec.CodeDeoptEventRecord_;
   Deoptimizer::DeoptInfo info = Deoptimizer::GetDeoptInfo(code, pc);
   rec->start = code->address();
   rec->deopt_reason = Deoptimizer::GetDeoptReason(info.deopt_reason);
   rec->position = info.position;
   rec->deopt_id = info.deopt_id;
-  processor_->Enqueue(evt_rec);
-  processor_->AddDeoptStack(isolate_, pc, fp_to_sp_delta);
+  rec->pc = reinterpret_cast<void*>(pc);
+  rec->fp_to_sp_delta = fp_to_sp_delta;
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::GetterCallbackEvent(Name* name, Address entry_point) {
+void ProfilerListener::GetterCallbackEvent(Name* name, Address entry_point) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = entry_point;
-  rec->entry = profiles_->NewCodeEntry(CodeEventListener::CALLBACK_TAG,
-                                       profiles_->GetName(name), "get ");
+  rec->entry =
+      NewCodeEntry(CodeEventListener::CALLBACK_TAG, GetName(name), "get ");
   rec->size = 1;
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-void CpuProfiler::RegExpCodeCreateEvent(AbstractCode* code, String* source) {
+void ProfilerListener::RegExpCodeCreateEvent(AbstractCode* code,
+                                             String* source) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = code->address();
-  rec->entry = profiles_->NewCodeEntry(
-      CodeEventListener::REG_EXP_TAG, profiles_->GetName(source), "RegExp: ",
+  rec->entry = NewCodeEntry(
+      CodeEventListener::REG_EXP_TAG, GetName(source), "RegExp: ",
       CodeEntry::kEmptyResourceName, CpuProfileNode::kNoLineNumberInfo,
       CpuProfileNode::kNoColumnNumberInfo, NULL, code->instruction_start());
   rec->size = code->ExecutableSize();
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-
-void CpuProfiler::SetterCallbackEvent(Name* name, Address entry_point) {
+void ProfilerListener::SetterCallbackEvent(Name* name, Address entry_point) {
   CodeEventsContainer evt_rec(CodeEventRecord::CODE_CREATION);
   CodeCreateEventRecord* rec = &evt_rec.CodeCreateEventRecord_;
   rec->start = entry_point;
-  rec->entry = profiles_->NewCodeEntry(CodeEventListener::CALLBACK_TAG,
-                                       profiles_->GetName(name), "set ");
+  rec->entry =
+      NewCodeEntry(CodeEventListener::CALLBACK_TAG, GetName(name), "set ");
   rec->size = 1;
-  processor_->Enqueue(evt_rec);
+  DispatchCodeEvent(evt_rec);
 }
 
-Name* CpuProfiler::InferScriptName(Name* name, SharedFunctionInfo* info) {
+Name* ProfilerListener::InferScriptName(Name* name, SharedFunctionInfo* info) {
   if (name->IsString() && String::cast(name)->length()) return name;
   if (!info->script()->IsScript()) return name;
   Object* source_url = Script::cast(info->script())->source_url();
   return source_url->IsName() ? Name::cast(source_url) : name;
 }
 
-void CpuProfiler::RecordInliningInfo(CodeEntry* entry,
-                                     AbstractCode* abstract_code) {
+void ProfilerListener::RecordInliningInfo(CodeEntry* entry,
+                                          AbstractCode* abstract_code) {
   if (!abstract_code->IsCode()) return;
   Code* code = abstract_code->GetCode();
   if (code->kind() != Code::OPTIMIZED_FUNCTION) return;
   DeoptimizationInputData* deopt_input_data =
       DeoptimizationInputData::cast(code->deoptimization_data());
   int deopt_count = deopt_input_data->DeoptCount();
   for (int i = 0; i < deopt_count; i++) {
     int pc_offset = deopt_input_data->Pc(i)->value();
     if (pc_offset == -1) continue;
     int translation_index = deopt_input_data->TranslationIndex(i)->value();
@@ skipping 12 matching lines @@
         it.Skip(Translation::NumberOfOperandsFor(opcode));
         continue;
       }
       it.Next();  // Skip ast_id
       int shared_info_id = it.Next();
       it.Next();  // Skip height
       SharedFunctionInfo* shared_info = SharedFunctionInfo::cast(
           deopt_input_data->LiteralArray()->get(shared_info_id));
       if (!depth++) continue;  // Skip the current function itself.
       CodeEntry* inline_entry = new CodeEntry(
-          entry->tag(), profiles_->GetFunctionName(shared_info->DebugName()),
+          entry->tag(), GetFunctionName(shared_info->DebugName()),
           CodeEntry::kEmptyNamePrefix, entry->resource_name(),
           CpuProfileNode::kNoLineNumberInfo,
           CpuProfileNode::kNoColumnNumberInfo, NULL, code->instruction_start());
       inline_entry->FillFunctionInfo(shared_info);
       inline_stack.push_back(inline_entry);
     }
     if (!inline_stack.empty()) {
       entry->AddInlineStack(pc_offset, inline_stack);
       DCHECK(inline_stack.empty());
     }
   }
 }
 
-void CpuProfiler::RecordDeoptInlinedFrames(CodeEntry* entry,
-                                           AbstractCode* abstract_code) {
+void ProfilerListener::RecordDeoptInlinedFrames(CodeEntry* entry,
+                                                AbstractCode* abstract_code) {
   if (abstract_code->kind() != AbstractCode::OPTIMIZED_FUNCTION) return;
   Code* code = abstract_code->GetCode();
   DeoptimizationInputData* deopt_input_data =
       DeoptimizationInputData::cast(code->deoptimization_data());
   int const mask = RelocInfo::ModeMask(RelocInfo::DEOPT_ID);
   for (RelocIterator rit(code, mask); !rit.done(); rit.next()) {
     RelocInfo* reloc_info = rit.rinfo();
     DCHECK(RelocInfo::IsDeoptId(reloc_info->rmode()));
     int deopt_id = static_cast<int>(reloc_info->data());
     int translation_index =
@@ skipping 26 matching lines @@
       CodeEntry::DeoptInlinedFrame frame = {source_position, script_id};
       inlined_frames.push_back(frame);
     }
     if (!inlined_frames.empty() && !entry->HasDeoptInlinedFramesFor(deopt_id)) {
       entry->AddDeoptInlinedFrames(deopt_id, inlined_frames);
       DCHECK(inlined_frames.empty());
     }
   }
 }
 
-CpuProfiler::CpuProfiler(Isolate* isolate)
-    : isolate_(isolate),
-      sampling_interval_(base::TimeDelta::FromMicroseconds(
-          FLAG_cpu_profiler_sampling_interval)),
-      profiles_(new CpuProfilesCollection(isolate)),
-      is_profiling_(false) {
-  profiles_->set_cpu_profiler(this);
+void ProfilerListener::StartBuildingCodeEntry() {
+  is_building_code_entry_ = true;
 }
 
-CpuProfiler::CpuProfiler(Isolate* isolate, CpuProfilesCollection* test_profiles,
-                         ProfileGenerator* test_generator,
-                         ProfilerEventsProcessor* test_processor)
-    : isolate_(isolate),
-      sampling_interval_(base::TimeDelta::FromMicroseconds(
-          FLAG_cpu_profiler_sampling_interval)),
-      profiles_(test_profiles),
-      generator_(test_generator),
-      processor_(test_processor),
-      is_profiling_(false) {
-  profiles_->set_cpu_profiler(this);
+CodeEntry* ProfilerListener::NewCodeEntry(
+    CodeEventListener::LogEventsAndTags tag, const char* name,
+    const char* name_prefix, const char* resource_name, int line_number,
+    int column_number, JITLineInfoTable* line_info, Address instruction_start) {
+  CodeEntry* code_entry =
+      new CodeEntry(tag, name, name_prefix, resource_name, line_number,
+                    column_number, line_info, instruction_start);
+  code_entries_.push_back(code_entry);
+  return code_entry;
 }
 
-CpuProfiler::~CpuProfiler() {
-  DCHECK(!is_profiling_);
+void ProfilerListener::AddObserver(CodeEventObserver* observer) {
+  for (auto it = observers_.begin(); it != observers_.end(); ++it) {

[alph, 2016/06/17 10:38:44]

nit: std::find

[lpy, 2016/06/17 13:55:00]

Done.

+    if (*it == observer) return;
+  }
+  observers_.push_back(observer);
 }
 
-void CpuProfiler::set_sampling_interval(base::TimeDelta value) {
-  DCHECK(!is_profiling_);
-  sampling_interval_ = value;
-}
-
-void CpuProfiler::ResetProfiles() {
-  profiles_.reset(new CpuProfilesCollection(isolate_));
-  profiles_->set_cpu_profiler(this);
-}
-
-void CpuProfiler::CollectSample() {
-  if (processor_) {
-    processor_->AddCurrentStack(isolate_);
+void ProfilerListener::RemoveObserver(CodeEventObserver* observer) {
+  for (auto it = observers_.begin(); it != observers_.end(); ++it) {

[alph, 2016/06/17 10:38:44]

nit: std::find

[lpy, 2016/06/17 13:55:00]

Done.

+    if (*it == observer) {
+      observers_.erase(it);
+      return;
+    }
   }
 }
 
-void CpuProfiler::StartProfiling(const char* title, bool record_samples) {
-  if (profiles_->StartProfiling(title, record_samples)) {
-    StartProcessorIfNotStarted();
-  }
-}
-
-
-void CpuProfiler::StartProfiling(String* title, bool record_samples) {
-  StartProfiling(profiles_->GetName(title), record_samples);
-  isolate_->debug()->feature_tracker()->Track(DebugFeatureTracker::kProfiler);
-}
-
-
-void CpuProfiler::StartProcessorIfNotStarted() {
-  if (processor_) {
-    processor_->AddCurrentStack(isolate_);
-    return;
-  }
-  Logger* logger = isolate_->logger();
-  // Disable logging when using the new implementation.
-  saved_is_logging_ = logger->is_logging_;
-  logger->is_logging_ = false;
-  sampler::Sampler* sampler = logger->sampler();
-  generator_.reset(new ProfileGenerator(profiles_.get()));
-  processor_.reset(new ProfilerEventsProcessor(generator_.get(), sampler,
-                                               sampling_interval_));
-  is_profiling_ = true;
-  isolate_->set_is_profiling(true);
-  // Enumerate stuff we already have in the heap.
-  DCHECK(isolate_->heap()->HasBeenSetUp());
-  isolate_->code_event_dispatcher()->AddListener(this);
-  if (!FLAG_prof_browser_mode) {
-    logger->LogCodeObjects();
-  }
-  logger->LogCompiledFunctions();
-  logger->LogAccessorCallbacks();
-  LogBuiltins();
-  // Enable stack sampling.
-  sampler->SetHasProcessingThread(true);
-  sampler->IncreaseProfilingDepth();
-  processor_->AddCurrentStack(isolate_);
-  processor_->StartSynchronously();
-}
-
-
-CpuProfile* CpuProfiler::StopProfiling(const char* title) {
-  if (!is_profiling_) return nullptr;
-  StopProcessorIfLastProfile(title);
-  CpuProfile* result = profiles_->StopProfiling(title);
-  if (result) {
-    result->Print();
-  }
-  return result;
-}
-
-
-CpuProfile* CpuProfiler::StopProfiling(String* title) {
-  if (!is_profiling_) return nullptr;
-  const char* profile_title = profiles_->GetName(title);
-  StopProcessorIfLastProfile(profile_title);
-  return profiles_->StopProfiling(profile_title);
-}
-
-
-void CpuProfiler::StopProcessorIfLastProfile(const char* title) {
-  if (profiles_->IsLastProfile(title)) {
-    StopProcessor();
-  }
-}
-
-
-void CpuProfiler::StopProcessor() {
-  Logger* logger = isolate_->logger();
-  sampler::Sampler* sampler =
-      reinterpret_cast<sampler::Sampler*>(logger->ticker_);
-  is_profiling_ = false;
-  isolate_->set_is_profiling(false);
-  isolate_->code_event_dispatcher()->RemoveListener(this);
-  processor_->StopSynchronously();
-  processor_.reset();
-  generator_.reset();
-  sampler->SetHasProcessingThread(false);
-  sampler->DecreaseProfilingDepth();
-  logger->is_logging_ = saved_is_logging_;
-}
-
-
-void CpuProfiler::LogBuiltins() {
-  Builtins* builtins = isolate_->builtins();
-  DCHECK(builtins->is_initialized());
-  for (int i = 0; i < Builtins::builtin_count; i++) {
-    CodeEventsContainer evt_rec(CodeEventRecord::REPORT_BUILTIN);
-    ReportBuiltinEventRecord* rec = &evt_rec.ReportBuiltinEventRecord_;
-    Builtins::Name id = static_cast<Builtins::Name>(i);
-    rec->start = builtins->builtin(id)->address();
-    rec->builtin_id = id;
-    processor_->Enqueue(evt_rec);
-  }
-}
-
-
 }  // namespace internal
 }  // namespace v8