Reviewers: Hannes Payer,
Message:
plz review
Description:
Move the management of the already swept pages to MarkCompactCollector
That way, MCC doesn't need to know about the state the threads are in to
steal free memory from them.
BUG=v8:3104
[email protected]
LOG=n
Please review this at https://codereview.chromium.org/143283002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+26, -29 lines):
M src/heap.cc
M src/mark-compact.h
M src/mark-compact.cc
M src/spaces.h
M src/sweeper-thread.h
M src/sweeper-thread.cc
Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index
8b033d60afb1af728db37b2bb7808a311d1fe151..799869a745c783c6a2f392d45d783433ed370ac2
100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -6531,6 +6531,8 @@ bool Heap::SetUp() {
store_buffer()->SetUp();
+ mark_compact_collector()->SetUp();
+
if (FLAG_concurrent_recompilation) relocation_mutex_ = new Mutex;
return true;
Index: src/mark-compact.cc
diff --git a/src/mark-compact.cc b/src/mark-compact.cc
index
7a76d1b334c4165e7e189713a908e982415e3046..d19df2bf58dd59e733bf38c2d66f26bd625cc2e4
100644
--- a/src/mark-compact.cc
+++ b/src/mark-compact.cc
@@ -348,6 +348,12 @@ static void VerifyNativeContextSeparation(Heap* heap) {
#endif
+void MarkCompactCollector::SetUp() {
+ free_list_old_data_space_.Reset(new FreeList(heap_->old_data_space()));
+ free_list_old_pointer_space_.Reset(new
FreeList(heap_->old_pointer_space()));
+}
+
+
void MarkCompactCollector::TearDown() {
AbortCompaction();
}
@@ -586,10 +592,10 @@ void
MarkCompactCollector::WaitUntilSweepingCompleted() {
intptr_t MarkCompactCollector::
StealMemoryFromSweeperThreads(PagedSpace* space) {
- intptr_t freed_bytes = 0;
- for (int i = 0; i < isolate()->num_sweeper_threads(); i++) {
- freed_bytes += isolate()->sweeper_threads()[i]->StealMemory(space);
- }
+ FreeList* free_list = space == heap()->old_pointer_space()
+ ? free_list_old_pointer_space_.get()
+ : free_list_old_data_space_.get();
+ intptr_t freed_bytes = space->free_list()->Concatenate(free_list);
space->AddToAccountingStats(freed_bytes);
space->DecrementUnsweptFreeBytes(freed_bytes);
return freed_bytes;
@@ -3971,9 +3977,11 @@ intptr_t
MarkCompactCollector::SweepConservatively(PagedSpace* space,
void MarkCompactCollector::SweepInParallel(PagedSpace* space,
- FreeList* private_free_list,
- FreeList* free_list) {
+ FreeList* private_free_list) {
PageIterator it(space);
+ FreeList* free_list = space == heap()->old_pointer_space()
+ ? free_list_old_pointer_space_.get()
+ : free_list_old_data_space_.get();
while (it.has_next()) {
Page* p = it.next();
Index: src/mark-compact.h
diff --git a/src/mark-compact.h b/src/mark-compact.h
index
01ecbf8ec9093e91024372e3f780daa5108e5e57..f44d6ca1df8a47022893129ce309be1c2140b17b
100644
--- a/src/mark-compact.h
+++ b/src/mark-compact.h
@@ -571,6 +571,8 @@ class MarkCompactCollector {
static void Initialize();
+ void SetUp();
+
void TearDown();
void CollectEvacuationCandidates(PagedSpace* space);
@@ -716,8 +718,7 @@ class MarkCompactCollector {
// Concurrent and parallel sweeping support.
void SweepInParallel(PagedSpace* space,
- FreeList* private_free_list,
- FreeList* free_list);
+ FreeList* private_free_list);
void WaitUntilSweepingCompleted();
@@ -957,6 +958,9 @@ class MarkCompactCollector {
List<Page*> evacuation_candidates_;
List<Code*> invalidated_code_;
+ SmartPointer<FreeList> free_list_old_data_space_;
+ SmartPointer<FreeList> free_list_old_pointer_space_;
+
friend class Heap;
};
Index: src/spaces.h
diff --git a/src/spaces.h b/src/spaces.h
index
ee11b6b496efd27f74f5693cb124322401d4fbc6..2ba567d27f83ae136b668ba71e2ea91543e2f609
100644
--- a/src/spaces.h
+++ b/src/spaces.h
@@ -1576,7 +1576,7 @@ class FreeListCategory {
// These spaces are call large.
// At least 16384 words. This list is for objects of 2048 words or larger.
// Empty pages are added to this list. These spaces are called huge.
-class FreeList BASE_EMBEDDED {
+class FreeList {
public:
explicit FreeList(PagedSpace* owner);
@@ -1945,7 +1945,7 @@ class PagedSpace : public Space {
MUST_USE_RESULT virtual HeapObject* SlowAllocateRaw(int size_in_bytes);
friend class PageIterator;
- friend class SweeperThread;
+ friend class MarkCompactCollector;
};
Index: src/sweeper-thread.cc
diff --git a/src/sweeper-thread.cc b/src/sweeper-thread.cc
index
6f3baed11f8f111d91e1caf6c61685b043489b7f..741b9dba4412439bb8e1cad8c4e15219c345097f
100644
--- a/src/sweeper-thread.cc
+++ b/src/sweeper-thread.cc
@@ -45,8 +45,6 @@ SweeperThread::SweeperThread(Isolate* isolate)
start_sweeping_semaphore_(0),
end_sweeping_semaphore_(0),
stop_semaphore_(0),
- free_list_old_data_space_(heap_->paged_space(OLD_DATA_SPACE)),
- free_list_old_pointer_space_(heap_->paged_space(OLD_POINTER_SPACE)),
private_free_list_old_data_space_(heap_->paged_space(OLD_DATA_SPACE)),
private_free_list_old_pointer_space_(
heap_->paged_space(OLD_POINTER_SPACE)) {
@@ -69,26 +67,14 @@ void SweeperThread::Run() {
}
collector_->SweepInParallel(heap_->old_data_space(),
- &private_free_list_old_data_space_,
- &free_list_old_data_space_);
+ &private_free_list_old_data_space_);
collector_->SweepInParallel(heap_->old_pointer_space(),
- &private_free_list_old_pointer_space_,
- &free_list_old_pointer_space_);
+ &private_free_list_old_pointer_space_);
end_sweeping_semaphore_.Signal();
}
}
-intptr_t SweeperThread::StealMemory(PagedSpace* space) {
- if (space->identity() == OLD_POINTER_SPACE) {
- return space->free_list()->Concatenate(&free_list_old_pointer_space_);
- } else if (space->identity() == OLD_DATA_SPACE) {
- return space->free_list()->Concatenate(&free_list_old_data_space_);
- }
- return 0;
-}
-
-
void SweeperThread::Stop() {
Release_Store(&stop_thread_, static_cast<AtomicWord>(true));
start_sweeping_semaphore_.Signal();
Index: src/sweeper-thread.h
diff --git a/src/sweeper-thread.h b/src/sweeper-thread.h
index
96255a0972af61b37543dc294018e01ff2d30073..085d5d0ca2b78b75af691390abdb1d2b56ca24aa
100644
--- a/src/sweeper-thread.h
+++ b/src/sweeper-thread.h
@@ -49,7 +49,6 @@ class SweeperThread : public Thread {
void Stop();
void StartSweeping();
void WaitForSweeperThread();
- intptr_t StealMemory(PagedSpace* space);
static int NumberOfThreads(int max_available);
@@ -60,8 +59,6 @@ class SweeperThread : public Thread {
Semaphore start_sweeping_semaphore_;
Semaphore end_sweeping_semaphore_;
Semaphore stop_semaphore_;
- FreeList free_list_old_data_space_;
- FreeList free_list_old_pointer_space_;
FreeList private_free_list_old_data_space_;
FreeList private_free_list_old_pointer_space_;
volatile AtomicWord stop_thread_;
--
--
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/groups/opt_out.
