Commit edd78f8
committed
deps: cherry-pick e0d64dc from upstream V8
Original commit message:
[heap] Print the number of chunks in unmapper queue in --trace-gc-nvp
Bug: chromium:771966
Change-Id: I146b279c4713b7dd716c6d55ca5e6c6e23a3ad7e
Reviewed-on: https://chromium-review.googlesource.com/704740
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48338}
Refs: v8/v8@e0d64dc
Refs: nodejs/help#917 (comment)
Refs: https://bugs.chromium.org/p/chromium/issues/detail?id=771966
PR-URL: #16490
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>1 parent cf38d2f commit edd78f8
4 files changed
Lines changed: 20 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | 28 | # Reset this number to 0 on major V8 upgrades. | |
| 29 | 29 | # Increment by one for each non-official patch applied to deps/v8. | |
| 30 | - 'v8_embedder_string': '-node.6', | ||
| 30 | + 'v8_embedder_string': '-node.7', | ||
| 31 | 31 | ||
| 32 | 32 | # Enable disassembler for `--print-code` v8 options | |
| 33 | 33 | 'v8_enable_disassembler': 1, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -490,6 +490,8 @@ void GCTracer::PrintNVP() const { | |||
| 490 | 490 | "promotion_rate=%.1f%% " | |
| 491 | 491 | "semi_space_copy_rate=%.1f%% " | |
| 492 | 492 | "new_space_allocation_throughput=%.1f " | |
| 493 | + "unmapper_chunks=%d " | ||
| 494 | + "unmapper_delayed_chunks=%d " | ||
| 493 | 495 | "context_disposal_rate=%.1f\n", | |
| 494 | 496 | duration, spent_in_mutator, current_.TypeName(true), | |
| 495 | 497 | current_.reduce_memory, current_.scopes[Scope::HEAP_PROLOGUE], | |
@@ -520,6 +522,8 @@ void GCTracer::PrintNVP() const { | |||
| 520 | 522 | AverageSurvivalRatio(), heap_->promotion_rate_, | |
| 521 | 523 | heap_->semi_space_copied_rate_, | |
| 522 | 524 | NewSpaceAllocationThroughputInBytesPerMillisecond(), | |
| 525 | + heap_->memory_allocator()->unmapper()->NumberOfChunks(), | ||
| 526 | + heap_->memory_allocator()->unmapper()->NumberOfDelayedChunks(), | ||
| 523 | 527 | ContextDisposalRateInMilliseconds()); | |
| 524 | 528 | break; | |
| 525 | 529 | case Event::MINOR_MARK_COMPACTOR: | |
@@ -654,6 +658,8 @@ void GCTracer::PrintNVP() const { | |||
| 654 | 658 | "promotion_rate=%.1f%% " | |
| 655 | 659 | "semi_space_copy_rate=%.1f%% " | |
| 656 | 660 | "new_space_allocation_throughput=%.1f " | |
| 661 | + "unmapper_chunks=%d " | ||
| 662 | + "unmapper_delayed_chunks=%d " | ||
| 657 | 663 | "context_disposal_rate=%.1f " | |
| 658 | 664 | "compaction_speed=%.f\n", | |
| 659 | 665 | duration, spent_in_mutator, current_.TypeName(true), | |
@@ -731,6 +737,8 @@ void GCTracer::PrintNVP() const { | |||
| 731 | 737 | AverageSurvivalRatio(), heap_->promotion_rate_, | |
| 732 | 738 | heap_->semi_space_copied_rate_, | |
| 733 | 739 | NewSpaceAllocationThroughputInBytesPerMillisecond(), | |
| 740 | + heap_->memory_allocator()->unmapper()->NumberOfChunks(), | ||
| 741 | + heap_->memory_allocator()->unmapper()->NumberOfDelayedChunks(), | ||
| 734 | 742 | ContextDisposalRateInMilliseconds(), | |
| 735 | 743 | CompactionSpeedInBytesPerMillisecond()); | |
| 736 | 744 | break; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -408,6 +408,15 @@ void MemoryAllocator::Unmapper::ReconsiderDelayedChunks() { | |||
| 408 | 408 | } | |
| 409 | 409 | } | |
| 410 | 410 | ||
| 411 | + int MemoryAllocator::Unmapper::NumberOfChunks() { | ||
| 412 | + base::LockGuard<base::Mutex> guard(&mutex_); | ||
| 413 | + size_t result = 0; | ||
| 414 | + for (int i = 0; i < kNumberOfChunkQueues; i++) { | ||
| 415 | + result += chunks_[i].size(); | ||
| 416 | + } | ||
| 417 | + return static_cast<int>(result); | ||
| 418 | + } | ||
| 419 | + | ||
| 411 | 420 | bool MemoryAllocator::CanFreeMemoryChunk(MemoryChunk* chunk) { | |
| 412 | 421 | MarkCompactCollector* mc = isolate_->heap()->mark_compact_collector(); | |
| 413 | 422 | // We cannot free a memory chunk in new space while the sweeper is running | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1204,6 +1204,8 @@ class V8_EXPORT_PRIVATE MemoryAllocator { | |||
| 1204 | 1204 | return static_cast<int>(delayed_regular_chunks_.size()); | |
| 1205 | 1205 | } | |
| 1206 | 1206 | ||
| 1207 | + int NumberOfChunks(); | ||
| 1208 | + | ||
| 1207 | 1209 | private: | |
| 1208 | 1210 | static const int kReservedQueueingSlots = 64; | |
| 1209 | 1211 | static const int kMaxUnmapperTasks = 24; | |
0 commit comments