[heap] Sweeper refactoring round 2

src/heap/mark-compact.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_HEAP_MARK_COMPACT_H_
 #define V8_HEAP_MARK_COMPACT_H_
 
+#include <deque>
+
 #include "src/base/bits.h"
 #include "src/heap/spaces.h"
 #include "src/heap/store-buffer.h"
 
 namespace v8 {
 namespace internal {
 
 // Callback function, returns whether an object is alive. The heap size
 // of the object is returned in size. It optionally updates the offset
 // to the first live object in the page (only used for old and map objects).
@@ skipping 384 matching lines @@
 
   class Sweeper {
    public:
     class SweeperTask;
 
     enum SweepingMode { SWEEP_ONLY, SWEEP_AND_VISIT_LIVE_OBJECTS };
     enum SkipListRebuildingMode { REBUILD_SKIP_LIST, IGNORE_SKIP_LIST };
     enum FreeSpaceTreatmentMode { IGNORE_FREE_SPACE, ZAP_FREE_SPACE };
     enum SweepingParallelism { SWEEP_ON_MAIN_THREAD, SWEEP_IN_PARALLEL };
 
-    typedef std::vector<Page*> SweepingList;
+    typedef std::deque<Page*> SweepingList;
     typedef List<Page*> SweptList;
 
     template <SweepingMode sweeping_mode, SweepingParallelism parallelism,
               SkipListRebuildingMode skip_list_mode,
               FreeSpaceTreatmentMode free_space_mode>
     static int RawSweep(PagedSpace* space, Page* p, ObjectVisitor* v);
 
     explicit Sweeper(Heap* heap)
         : heap_(heap),
           pending_sweeper_tasks_semaphore_(0),
           sweeping_in_progress_(false),
-          num_sweeping_tasks_(0) {
-      ForAllSweepingSpaces([this](AllocationSpace space) {
-        late_sweeping_list_[space] = nullptr;
-        tmp_late_sweeping_list_[space] = nullptr;
-      });
-    }
+          late_pages_(false),
+          num_sweeping_tasks_(0) {}
 
     bool sweeping_in_progress() { return sweeping_in_progress_; }
+    bool contains_late_pages() { return late_pages_; }
 
     void AddPage(AllocationSpace space, Page* page);
     void AddLatePage(AllocationSpace space, Page* page);
-    void CommitLateList(AllocationSpace space);
 
     int ParallelSweepSpace(AllocationSpace identity, int required_freed_bytes,
                            int max_pages = 0);
     int ParallelSweepPage(Page* page, PagedSpace* space);
 
     void StartSweeping();
     void StartSweepingHelper(AllocationSpace space_to_start);
     void EnsureCompleted();
     bool IsSweepingCompleted();
     void SweepOrWaitUntilSweepingCompleted(Page* page);
 
     void AddSweptPageSafe(PagedSpace* space, Page* page);
     Page* GetSweptPageSafe(PagedSpace* space);
 
    private:
     static const int kAllocationSpaces = LAST_PAGED_SPACE + 1;
 
     template <typename Callback>
     void ForAllSweepingSpaces(Callback callback) {
       for (int i = 0; i < kAllocationSpaces; i++) {
         callback(static_cast<AllocationSpace>(i));
       }
     }
 
-    SweepingList* GetLateSweepingListSafe(AllocationSpace space);
+    Page* GetSweepingPageSafe(AllocationSpace space);
+    void AddSweepingPageSafe(AllocationSpace space, Page* page);
 
     void PrepareToBeSweptPage(AllocationSpace space, Page* page);
-    void ParallelSweepList(SweepingList& list, AllocationSpace out_space,
-                           int required_freed_bytes, int max_pages,
-                           int* max_freed, int* pages_freed);
 
     Heap* heap_;
     base::Mutex mutex_;
     base::Semaphore pending_sweeper_tasks_semaphore_;
     SweptList swept_list_[kAllocationSpaces];
     SweepingList sweeping_list_[kAllocationSpaces];
-    SweepingList* late_sweeping_list_[kAllocationSpaces];
-    SweepingList* tmp_late_sweeping_list_[kAllocationSpaces];
     bool sweeping_in_progress_;
+    bool late_pages_;
     int num_sweeping_tasks_;
   };
 
   enum IterationMode {
     kKeepMarking,
     kClearMarkbits,
   };
 
   static void Initialize();
 
@@ skipping 413 matching lines @@
  private:
   MarkCompactCollector* collector_;
 };
 
 
 const char* AllocationSpaceName(AllocationSpace space);
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_HEAP_MARK_COMPACT_H_