Commit 5787f53
deps: cherry-pick 2c75616 from upstream V8
Original commit message:
[heap] Ensure progress in unmapping memory chunks.
If sweeping is not making progress and there are many young generation
GCs happening, then this can lead to accumulation of memory chunks in
the unmapper queue.
Bug: chromium:771966
Change-Id: Ief73ada0d17198a80b668850c6d2e7ea413113e7
Reviewed-on: https://chromium-review.googlesource.com/702479
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48312}
Refs: v8/v8@2c75616
Refs: nodejs/help#917 (comment)
Refs: https://bugs.chromium.org/p/chromium/issues/detail?id=771966
PR-URL: #16490
Backport-PR-URL: #16569
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 d6619b9 commit 5787f53
3 files changed
Lines changed: 12 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,7 @@ | |||
| 11 | 11 | #define V8_MAJOR_VERSION 6 | |
| 12 | 12 | #define V8_MINOR_VERSION 1 | |
| 13 | 13 | #define V8_BUILD_NUMBER 534 | |
| 14 | - #define V8_PATCH_LEVEL 42 | ||
| 14 | + #define V8_PATCH_LEVEL 43 | ||
| 15 | 15 | ||
| 16 | 16 | // Use 1 for candidates and 0 otherwise. | |
| 17 | 17 | // (Boolean macro values are not supported by all preprocessors.) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1716,6 +1716,12 @@ void Heap::Scavenge() { | |||
| 1716 | 1716 | IncrementalMarking::PauseBlackAllocationScope pause_black_allocation( | |
| 1717 | 1717 | incremental_marking()); | |
| 1718 | 1718 | ||
| 1719 | + if (mark_compact_collector()->sweeper().sweeping_in_progress() && | ||
| 1720 | + memory_allocator_->unmapper()->NumberOfDelayedChunks() > | ||
| 1721 | + kMaxSemiSpaceSizeInKB / Page::kPageSize) { | ||
| 1722 | + mark_compact_collector()->EnsureSweepingCompleted(); | ||
| 1723 | + } | ||
| 1724 | + | ||
| 1719 | 1725 | mark_compact_collector()->sweeper().EnsureNewSpaceCompleted(); | |
| 1720 | 1726 | ||
| 1721 | 1727 | SetGCState(SCAVENGE); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1226,6 +1226,11 @@ class V8_EXPORT_PRIVATE MemoryAllocator { | |||
| 1226 | 1226 | ||
| 1227 | 1227 | bool has_delayed_chunks() { return delayed_regular_chunks_.size() > 0; } | |
| 1228 | 1228 | ||
| 1229 | + int NumberOfDelayedChunks() { | ||
| 1230 | + base::LockGuard<base::Mutex> guard(&mutex_); | ||
| 1231 | + return static_cast<int>(delayed_regular_chunks_.size()); | ||
| 1232 | + } | ||
| 1233 | + | ||
| 1229 | 1234 | private: | |
| 1230 | 1235 | static const int kReservedQueueingSlots = 64; | |
| 1231 | 1236 | static const int kMaxUnmapperTasks = 24; | |
0 commit comments