diff options
| author | Michaël Zasso <targos@protonmail.com> | 2016-09-06 22:49:51 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2016-09-22 09:51:19 +0200 |
| commit | ec02b811a8a5c999bab4de312be2d732b7d9d50b (patch) | |
| tree | ca3068017254f238cf413a451c57a803572983a4 /deps/v8/src/profiler/cpu-profiler-inl.h | |
| parent | d2eb7ce0105369a9cad82787cb33a665e9bd00ad (diff) | |
| download | node-new-ec02b811a8a5c999bab4de312be2d732b7d9d50b.tar.gz | |
deps: update V8 to 5.4.500.27
Pick up latest commit from the 5.4-lkgr branch.
deps: edit V8 gitignore to allow trace event copy
deps: update V8 trace event to 315bf1e2d45be7d53346c31cfcc37424a32c30c8
deps: edit V8 gitignore to allow gtest_prod.h copy
deps: update V8 gtest to 6f8a66431cb592dad629028a50b3dd418a408c87
PR-URL: https://github.com/nodejs/node/pull/8317
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Diffstat (limited to 'deps/v8/src/profiler/cpu-profiler-inl.h')
| -rw-r--r-- | deps/v8/src/profiler/cpu-profiler-inl.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/deps/v8/src/profiler/cpu-profiler-inl.h b/deps/v8/src/profiler/cpu-profiler-inl.h index 45e4ccf136..504c3f6e1a 100644 --- a/deps/v8/src/profiler/cpu-profiler-inl.h +++ b/deps/v8/src/profiler/cpu-profiler-inl.h @@ -35,7 +35,7 @@ void CodeDisableOptEventRecord::UpdateCodeMap(CodeMap* code_map) { void CodeDeoptEventRecord::UpdateCodeMap(CodeMap* code_map) { CodeEntry* entry = code_map->FindEntry(start); - if (entry != NULL) entry->set_deopt_info(deopt_reason, position, pc_offset); + if (entry != NULL) entry->set_deopt_info(deopt_reason, position, deopt_id); } @@ -50,17 +50,6 @@ void ReportBuiltinEventRecord::UpdateCodeMap(CodeMap* code_map) { } -TickSample* CpuProfiler::StartTickSample() { - if (is_profiling_) return processor_->StartTickSample(); - return NULL; -} - - -void CpuProfiler::FinishTickSample() { - processor_->FinishTickSample(); -} - - TickSample* ProfilerEventsProcessor::StartTickSample() { void* address = ticks_buffer_.StartEnqueue(); if (address == NULL) return NULL; |