Skip to content

deps: cherry-pick garbage collection fixes from upstream V8#16490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
targos wants to merge 3 commits into from
Closed

deps: cherry-pick garbage collection fixes from upstream V8 #16490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a246b3d
deps: cherry-pick 2c75616 from upstream V8
targos Oct 25, 2017
6f1eb7e
deps: cherry-pick 676c413 from upstream V8
targos Oct 25, 2017
0b96530
deps: cherry-pick e0d64dc from upstream V8
targos Oct 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.gypi
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.4',
'v8_embedder_string': '-node.7',

# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
Expand Down
8 changes: 8 additions & 0 deletions deps/v8/src/heap/gc-tracer.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -490,6 +490,8 @@ void GCTracer::PrintNVP() const{
"promotion_rate=%.1f%% "
"semi_space_copy_rate=%.1f%% "
"new_space_allocation_throughput=%.1f "
"unmapper_chunks=%d "
"unmapper_delayed_chunks=%d "
"context_disposal_rate=%.1f\n",
duration, spent_in_mutator, current_.TypeName(true),
current_.reduce_memory, current_.scopes[Scope::HEAP_PROLOGUE],
Expand DownExpand Up@@ -520,6 +522,8 @@ void GCTracer::PrintNVP() const{
AverageSurvivalRatio(), heap_->promotion_rate_,
heap_->semi_space_copied_rate_,
NewSpaceAllocationThroughputInBytesPerMillisecond(),
heap_->memory_allocator()->unmapper()->NumberOfChunks(),
heap_->memory_allocator()->unmapper()->NumberOfDelayedChunks(),
ContextDisposalRateInMilliseconds());
break;
case Event::MINOR_MARK_COMPACTOR:
Expand DownExpand Up@@ -654,6 +658,8 @@ void GCTracer::PrintNVP() const{
"promotion_rate=%.1f%% "
"semi_space_copy_rate=%.1f%% "
"new_space_allocation_throughput=%.1f "
"unmapper_chunks=%d "
"unmapper_delayed_chunks=%d "
"context_disposal_rate=%.1f "
"compaction_speed=%.f\n",
duration, spent_in_mutator, current_.TypeName(true),
Expand DownExpand Up@@ -731,6 +737,8 @@ void GCTracer::PrintNVP() const{
AverageSurvivalRatio(), heap_->promotion_rate_,
heap_->semi_space_copied_rate_,
NewSpaceAllocationThroughputInBytesPerMillisecond(),
heap_->memory_allocator()->unmapper()->NumberOfChunks(),
heap_->memory_allocator()->unmapper()->NumberOfDelayedChunks(),
ContextDisposalRateInMilliseconds(),
CompactionSpeedInBytesPerMillisecond());
break;
Expand Down
6 changes: 6 additions & 0 deletions deps/v8/src/heap/heap.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1885,6 +1885,12 @@ void Heap::Scavenge(){
IncrementalMarking::PauseBlackAllocationScope pause_black_allocation(
incremental_marking());

if (mark_compact_collector()->sweeper().sweeping_in_progress() &&
memory_allocator_->unmapper()->NumberOfDelayedChunks() >
static_cast<int>(new_space_->MaximumCapacity() / Page::kPageSize)){
mark_compact_collector()->EnsureSweepingCompleted();
}

mark_compact_collector()->sweeper().EnsureNewSpaceCompleted();

SetGCState(SCAVENGE);
Expand Down
9 changes: 9 additions & 0 deletions deps/v8/src/heap/spaces.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -408,6 +408,15 @@ void MemoryAllocator::Unmapper::ReconsiderDelayedChunks(){
}
}

intMemoryAllocator::Unmapper::NumberOfChunks(){
base::LockGuard<base::Mutex> guard(&mutex_);
size_t result = 0;
for (int i = 0; i < kNumberOfChunkQueues; i++){
result += chunks_[i].size();
}
returnstatic_cast<int>(result);
}

boolMemoryAllocator::CanFreeMemoryChunk(MemoryChunk* chunk){
MarkCompactCollector* mc = isolate_->heap()->mark_compact_collector();
// We cannot free a memory chunk in new space while the sweeper is running
Expand Down
7 changes: 7 additions & 0 deletions deps/v8/src/heap/spaces.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1199,6 +1199,13 @@ class V8_EXPORT_PRIVATE MemoryAllocator{

bool has_delayed_chunks(){return delayed_regular_chunks_.size() > 0}

int NumberOfDelayedChunks(){
base::LockGuard<base::Mutex> guard(&mutex_);
return static_cast<int>(delayed_regular_chunks_.size());
}

int NumberOfChunks();

private:
static const int kReservedQueueingSlots = 64;
static const int kMaxUnmapperTasks = 24;
Expand Down