Reviewers: ulan,
Description:
Fix OOM bug 3976.
Also introduce --trace-fragmentation-verbose, and fix --always-compact.
[email protected]
BUG=
Please review this at https://codereview.chromium.org/1024823002/
Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+32, -15 lines):
M src/flag-definitions.h
M src/heap/mark-compact.cc
M src/hydrogen.cc
M src/objects-inl.h
M test/cctest/test-heap.cc
Index: src/flag-definitions.h
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index
49d44746e8297ed46c730cd50371a6a509985660..477ed830f6bcd731d7f389f963a26fa433106c2b
100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -548,8 +548,9 @@ DEFINE_BOOL(print_max_heap_committed, false,
"in name=value format on exit")
DEFINE_BOOL(trace_gc_verbose, false,
"print more details following each garbage collection")
-DEFINE_BOOL(trace_fragmentation, false,
- "report fragmentation for old pointer and data pages")
+DEFINE_BOOL(trace_fragmentation, false, "report fragmentation for old
space")
+DEFINE_BOOL(trace_fragmentation_verbose, false,
+ "report fragmentation for old space (detailed)")
DEFINE_BOOL(collect_maps, true,
"garbage collect maps from which no objects can be reached")
DEFINE_BOOL(weak_embedded_maps_in_ic, true,
Index: src/heap/mark-compact.cc
diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index
57c93366b845a812a6f2193a1ea4c22a6d911b6e..a94d4782ee53cfebb0692fe083e6e12fd9604a7f
100644
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -595,11 +595,11 @@ const char* AllocationSpaceName(AllocationSpace
space) {
static int FreeListFragmentation(PagedSpace* space, Page* p) {
// If page was not swept then there are no free list items on it.
if (!p->WasSwept()) {
- if (FLAG_trace_fragmentation) {
+ if (FLAG_trace_fragmentation_verbose) {
PrintF("%p [%s]: %d bytes live (unswept)\n",
reinterpret_cast<void*>(p),
AllocationSpaceName(space->identity()), p->LiveBytes());
}
- return 0;
+ return FLAG_always_compact ? 1 : 0;
}
PagedSpace::SizeStats sizes;
@@ -616,7 +616,7 @@ static int FreeListFragmentation(PagedSpace* space,
Page* p) {
ratio_threshold = 15;
}
- if (FLAG_trace_fragmentation) {
+ if (FLAG_trace_fragmentation_verbose) {
PrintF("%p [%s]: %d (%.2f%%) %d (%.2f%%) %d (%.2f%%) %d (%.2f%%) %s\n",
reinterpret_cast<void*>(p),
AllocationSpaceName(space->identity()),
static_cast<int>(sizes.small_size_),
@@ -645,7 +645,7 @@ void
MarkCompactCollector::CollectEvacuationCandidates(PagedSpace* space) {
space->identity() == OLD_DATA_SPACE ||
space->identity() == CODE_SPACE);
- static const int kMaxMaxEvacuationCandidates = 1000;
+ static const int kMaxMaxEvacuationCandidates = 10000;
int number_of_pages = space->CountTotalPages();
int max_evacuation_candidates =
static_cast<int>(std::sqrt(number_of_pages / 2.0) + 1);
@@ -692,6 +692,10 @@ void
MarkCompactCollector::CollectEvacuationCandidates(PagedSpace* space) {
max_evacuation_candidates *= 2;
}
+ if (FLAG_always_compact) {
+ max_evacuation_candidates = kMaxMaxEvacuationCandidates;
+ }
+
if (FLAG_trace_fragmentation && mode == REDUCE_MEMORY_FOOTPRINT) {
PrintF(
"Estimated over reserved memory: %.1f / %.1f MB (threshold %d), "
@@ -723,7 +727,7 @@ void
MarkCompactCollector::CollectEvacuationCandidates(PagedSpace* space) {
unsigned int counter = space->heap()->ms_count();
uintptr_t page_number = reinterpret_cast<uintptr_t>(p) >>
kPageSizeBits;
if ((counter & 1) == (page_number & 1)) fragmentation = 1;
- } else if (mode == REDUCE_MEMORY_FOOTPRINT) {
+ } else if (mode == REDUCE_MEMORY_FOOTPRINT && !FLAG_always_compact) {
// Don't try to release too many pages.
if (estimated_release >= over_reserved) {
continue;
@@ -748,7 +752,7 @@ void
MarkCompactCollector::CollectEvacuationCandidates(PagedSpace* space) {
fragmentation = 0;
}
- if (FLAG_trace_fragmentation) {
+ if (FLAG_trace_fragmentation_verbose) {
PrintF("%p [%s]: %d (%.2f%%) free %s\n",
reinterpret_cast<void*>(p),
AllocationSpaceName(space->identity()),
static_cast<int>(free_bytes),
@@ -3039,6 +3043,7 @@ void
MarkCompactCollector::EvacuateLiveObjectsFromPage(Page* p) {
void MarkCompactCollector::EvacuatePages() {
int npages = evacuation_candidates_.length();
+ int abandoned_pages = 0;
for (int i = 0; i < npages; i++) {
Page* p = evacuation_candidates_[i];
DCHECK(p->IsEvacuationCandidate() ||
@@ -3054,7 +3059,7 @@ void MarkCompactCollector::EvacuatePages() {
if (p->IsEvacuationCandidate()) {
// During compaction we might have to request a new page. Check that
we
// have an emergency page and the space still has room for that.
- if (space->HasEmergencyMemory() && space->CanExpand()) {
+ if (space->HasEmergencyMemory() || space->CanExpand()) {
EvacuateLiveObjectsFromPage(p);
} else {
// Without room for expansion evacuation is not guaranteed to
succeed.
@@ -3065,6 +3070,7 @@ void MarkCompactCollector::EvacuatePages() {
page->ClearEvacuationCandidate();
page->SetFlag(Page::RESCAN_ON_EVACUATION);
}
+ abandoned_pages = npages - i;
break;
}
}
@@ -3078,6 +3084,16 @@ void MarkCompactCollector::EvacuatePages() {
space->FreeEmergencyMemory();
}
}
+ if (FLAG_trace_fragmentation) {
+ if (abandoned_pages != 0) {
+ PrintF(
+ " Abandon %d out of %d page defragmentations due to lack of "
+ "memory\n",
+ abandoned_pages, npages);
+ } else {
+ PrintF(" Defragmented %d pages\n", npages);
+ }
+ }
}
}
@@ -3431,7 +3447,7 @@ void
MarkCompactCollector::EvacuateNewSpaceAndCandidates() {
GCTracer::Scope::MC_UPDATE_POINTERS_TO_EVACUATED);
SlotsBuffer::UpdateSlotsRecordedIn(heap_, migration_slots_buffer_,
code_slots_filtering_required);
- if (FLAG_trace_fragmentation) {
+ if (FLAG_trace_fragmentation_verbose) {
PrintF(" migration slots buffer: %d\n",
SlotsBuffer::SizeOfChain(migration_slots_buffer_));
}
@@ -3466,7 +3482,7 @@ void
MarkCompactCollector::EvacuateNewSpaceAndCandidates() {
if (p->IsEvacuationCandidate()) {
SlotsBuffer::UpdateSlotsRecordedIn(heap_, p->slots_buffer(),
code_slots_filtering_required);
- if (FLAG_trace_fragmentation) {
+ if (FLAG_trace_fragmentation_verbose) {
PrintF(" page %p slots buffer: %d\n",
reinterpret_cast<void*>(p),
SlotsBuffer::SizeOfChain(p->slots_buffer()));
}
Index: src/hydrogen.cc
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index
834af7245ff295166935394cdaa6411bfbdea052..15b47674d30bee227f61d20c9f47e51ab34b6d90
100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -3356,7 +3356,7 @@
HOptimizedGraphBuilder::HOptimizedGraphBuilder(CompilationInfo* info)
// This is not initialized in the initializer list because the
// constructor for the initial state relies on function_state_ == NULL
// to know it's the initial state.
- function_state_= &initial_function_state_;
+ function_state_ = &initial_function_state_;
InitializeAstVisitor(info->zone());
if (FLAG_hydrogen_track_positions) {
SetSourcePosition(info->shared_info()->start_position());
@@ -10329,7 +10329,7 @@ bool HGraphBuilder::MatchRotateRight(HValue* left,
!ShiftAmountsAllowReplaceByRotate(shr->right(), shl->right())) {
return false;
}
- *operand= shr->left();
+ *operand = shr->left();
*shift_amount = shr->right();
return true;
}
Index: src/objects-inl.h
diff --git a/src/objects-inl.h b/src/objects-inl.h
index
cffb27b4444997b48dd018119e681690f6da17bf..d17cc95c89072c378d52eabeb581da89c1a54836
100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -6503,7 +6503,7 @@ JSRegExp::Flags JSRegExp::GetFlags() {
String* JSRegExp::Pattern() {
DCHECK(this->data()->IsFixedArray());
Object* data = this->data();
- String* pattern= String::cast(FixedArray::cast(data)->get(kSourceIndex));
+ String* pattern =
String::cast(FixedArray::cast(data)->get(kSourceIndex));
return pattern;
}
Index: test/cctest/test-heap.cc
diff --git a/test/cctest/test-heap.cc b/test/cctest/test-heap.cc
index
a852f06839c54fdf3b81f57aaa2e6d57712eae60..6929bc43a64fe333d24502867db8fab14c5b35e1
100644
--- a/test/cctest/test-heap.cc
+++ b/test/cctest/test-heap.cc
@@ -4529,7 +4529,7 @@ TEST(Regress357137) {
CcTest::InitializeVM();
v8::Isolate* isolate = CcTest::isolate();
v8::HandleScope hscope(isolate);
- v8::Handle<v8::ObjectTemplate> global =v8::ObjectTemplate::New(isolate);
+ v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate);
global->Set(v8::String::NewFromUtf8(isolate, "interrupt"),
v8::FunctionTemplate::New(isolate, RequestInterrupt));
v8::Local<v8::Context> context = v8::Context::New(isolate, NULL, global);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
