AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[heap] Fix recursive GCs caused by adjusting externally allocated memory

Browse Source 
R=mstarzinger@chromium.org
BUG=chromium:526244
LOG=N

Review URL: https://codereview.chromium.org/1325643002

Cr-Commit-Position: refs/heads/master@{#30478}
This commit is contained in:
mlippautz 2015-08-31 08:36:24 -07:00 committed by Commit bot
parent ca8134c834
commit 1a8c38c505
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api.cc
View File

@ -6873,6 +6873,7 @@ Local<Integer> v8::Integer::NewFromUnsigned(Isolate* isolate, uint32_t value) {
void Isolate::CollectAllGarbage(const char* gc_reason) { void Isolate::CollectAllGarbage(const char* gc_reason) {
i::Heap* heap = reinterpret_cast<i::Isolate*>(this)->heap(); i::Heap* heap = reinterpret_cast<i::Isolate*>(this)->heap();
DCHECK_EQ(heap->gc_state(), i::Heap::NOT_IN_GC);
if (heap->incremental_marking()->IsStopped()) { if (heap->incremental_marking()->IsStopped()) {
if (heap->incremental_marking()->CanBeActivated()) { if (heap->incremental_marking()->CanBeActivated()) {
heap->StartIncrementalMarking( heap->StartIncrementalMarking(

12
src/heap/heap.cc
View File

@ -1800,6 +1800,9 @@ void Heap::RegisterNewArrayBuffer(bool in_new_space, void* data,
RegisterNewArrayBufferHelper(live_array_buffers_for_scavenge_, data, RegisterNewArrayBufferHelper(live_array_buffers_for_scavenge_, data,
length); length);
} }
// We may go over the limit of externally allocated memory here. We call the
// api function to trigger a GC in this case.
reinterpret_cast<v8::Isolate*>(isolate_) reinterpret_cast<v8::Isolate*>(isolate_)
->AdjustAmountOfExternalAllocatedMemory(length); ->AdjustAmountOfExternalAllocatedMemory(length);
} }
@ -1842,16 +1845,13 @@ void Heap::FreeDeadArrayBuffers(bool from_scavenge) {
live_array_buffers_for_scavenge_.erase(buffer.first); live_array_buffers_for_scavenge_.erase(buffer.first);
} }
} }
size_t freed_memory = FreeDeadArrayBuffersHelper(
// Do not call through the api as this code is triggered while doing a GC.
amount_of_external_allocated_memory_ += FreeDeadArrayBuffersHelper(
isolate_, isolate_,
from_scavenge ? live_array_buffers_for_scavenge_ : live_array_buffers_, from_scavenge ? live_array_buffers_for_scavenge_ : live_array_buffers_,
from_scavenge ? not_yet_discovered_array_buffers_for_scavenge_ from_scavenge ? not_yet_discovered_array_buffers_for_scavenge_
: not_yet_discovered_array_buffers_); : not_yet_discovered_array_buffers_);
if (freed_memory) {
reinterpret_cast<v8::Isolate*>(isolate_)
->AdjustAmountOfExternalAllocatedMemory(
-static_cast<int64_t>(freed_memory));
}
} }