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

Try to reduce memory footprint when we run out of memory in Deserializer.

Browse Source 
BUG=403113
LOG=n

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

Cr-Commit-Position: refs/heads/master@{#26010}
This commit is contained in:
hpayer 2015-01-09 04:54:07 -08:00 committed by Commit bot
parent 7e98658e31
commit b1bcf6667d
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/heap/heap.cc
View File

@ -922,15 +922,6 @@ static void VerifyStringTable(Heap* heap) {
#endif // VERIFY_HEAP
static bool AbortIncrementalMarkingAndCollectGarbage(
Heap* heap, AllocationSpace space, const char* gc_reason = NULL) {
heap->mark_compact_collector()->SetFlags(Heap::kAbortIncrementalMarkingMask);
bool result = heap->CollectGarbage(space, gc_reason);
heap->mark_compact_collector()->SetFlags(Heap::kNoGCFlags);
return result;
}
bool Heap::ReserveSpace(Reservation* reservations) {
bool gc_performed = true;
int counter = 0;
@ -972,12 +963,18 @@ bool Heap::ReserveSpace(Reservation* reservations) {
}
if (perform_gc) {
if (space == NEW_SPACE) {
Heap::CollectGarbage(NEW_SPACE,
"failed to reserve space in the new space");
CollectGarbage(NEW_SPACE, "failed to reserve space in the new space");
} else {
AbortIncrementalMarkingAndCollectGarbage(
this, static_cast<AllocationSpace>(space),
"failed to reserve space in paged or large object space");
if (counter > 1) {
CollectAllGarbage(
kReduceMemoryFootprintMask,
"failed to reserve space in paged or large "
"object space, trying to reduce memory footprint");
} else {
CollectAllGarbage(
kAbortIncrementalMarkingMask,
"failed to reserve space in paged or large object space");
}
}
gc_performed = true;
break; // Abort for-loop over spaces and retry.