Revision: 18706
Author: [email protected]
Date: Tue Jan 21 11:41:18 2014 UTC
Log: 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
Review URL: https://codereview.chromium.org/143283002
http://code.google.com/p/v8/source/detail?r=18706
Modified:
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/mark-compact.cc
/branches/bleeding_edge/src/mark-compact.h
/branches/bleeding_edge/src/spaces.h
/branches/bleeding_edge/src/sweeper-thread.cc
/branches/bleeding_edge/src/sweeper-thread.h
=======================================
--- /branches/bleeding_edge/src/heap.cc Mon Jan 20 14:14:07 2014 UTC
+++ /branches/bleeding_edge/src/heap.cc Tue Jan 21 11:41:18 2014 UTC
@@ -6531,6 +6531,8 @@
store_buffer()->SetUp();
+ mark_compact_collector()->SetUp();
+
if (FLAG_concurrent_recompilation) relocation_mutex_ = new Mutex;
return true;
=======================================
--- /branches/bleeding_edge/src/mark-compact.cc Mon Jan 20 14:14:07 2014 UTC
+++ /branches/bleeding_edge/src/mark-compact.cc Tue Jan 21 11:41:18 2014 UTC
@@ -348,6 +348,12 @@
#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 @@
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 @@
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();
=======================================
--- /branches/bleeding_edge/src/mark-compact.h Mon Jan 20 11:57:56 2014 UTC
+++ /branches/bleeding_edge/src/mark-compact.h Tue Jan 21 11:41:18 2014 UTC
@@ -571,6 +571,8 @@
static void Initialize();
+ void SetUp();
+
void TearDown();
void CollectEvacuationCandidates(PagedSpace* space);
@@ -716,8 +718,7 @@
// 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 @@
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;
};
=======================================
--- /branches/bleeding_edge/src/spaces.h Thu Nov 14 15:14:37 2013 UTC
+++ /branches/bleeding_edge/src/spaces.h Tue Jan 21 11:41:18 2014 UTC
@@ -1576,7 +1576,7 @@
// 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 @@
MUST_USE_RESULT virtual HeapObject* SlowAllocateRaw(int size_in_bytes);
friend class PageIterator;
- friend class SweeperThread;
+ friend class MarkCompactCollector;
};
=======================================
--- /branches/bleeding_edge/src/sweeper-thread.cc Tue Nov 19 11:52:47 2013
UTC
+++ /branches/bleeding_edge/src/sweeper-thread.cc Tue Jan 21 11:41:18 2014
UTC
@@ -45,8 +45,6 @@
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,24 +67,12 @@
}
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() {
=======================================
--- /branches/bleeding_edge/src/sweeper-thread.h Tue Nov 19 11:52:47 2013
UTC
+++ /branches/bleeding_edge/src/sweeper-thread.h Tue Jan 21 11:41:18 2014
UTC
@@ -49,7 +49,6 @@
void Stop();
void StartSweeping();
void WaitForSweeperThread();
- intptr_t StealMemory(PagedSpace* space);
static int NumberOfThreads(int max_available);
@@ -60,8 +59,6 @@
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.
