[heap] Remove unswept bytes counter

src/heap/mark-compact.cc

Index: src/heap/mark-compact.cc
diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index d161b1853d8afb662193e416dfa471380f93164b..ff3c718f5fa0502df6c45241f274a717a33aa5db 100644
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -569,9 +569,6 @@ void MarkCompactCollector::EnsureSweepingCompleted() {
   RefillFreeList(heap()->paged_space(OLD_SPACE));
   RefillFreeList(heap()->paged_space(CODE_SPACE));
   RefillFreeList(heap()->paged_space(MAP_SPACE));
-  heap()->paged_space(OLD_SPACE)->ResetUnsweptFreeBytes();
-  heap()->paged_space(CODE_SPACE)->ResetUnsweptFreeBytes();
-  heap()->paged_space(MAP_SPACE)->ResetUnsweptFreeBytes();
 
 #ifdef VERIFY_HEAP
   if (FLAG_verify_heap && !evacuation()) {
@@ -606,9 +603,8 @@ void MarkCompactCollector::RefillFreeList(PagedSpace* space) {
     return;
   }
 
-  intptr_t freed_bytes = space->free_list()->Concatenate(free_list);
-  space->AddToAccountingStats(freed_bytes);
-  space->DecrementUnsweptFreeBytes(freed_bytes);
+  intptr_t added = space->free_list()->Concatenate(free_list);

[Michael Lippautz, 2015/10/01 13:14:03]

It should be relatively easy to make RefillFreeList work with compaction spaces
now.

+  space->accounting_stats_.IncreaseCapacity(added);
 }
 
 
@@ -4354,9 +4350,9 @@ void MarkCompactCollector::SweepSpace(PagedSpace* space, SweeperType sweeper) {
           PrintF("Sweeping 0x%" V8PRIxPTR " released page.\n",
                  reinterpret_cast<intptr_t>(p));
         }
-        // Adjust unswept free bytes because releasing a page expects said
+        // Adjust bytes allocated because releasing a page expects said
         // counter to be accurate for unswept pages.
-        space->IncreaseUnsweptFreeBytes(p);
+        space->accounting_stats_.AllocateBytes(p->area_size());
         space->ReleasePage(p);
         continue;
       }
@@ -4390,7 +4386,9 @@ void MarkCompactCollector::SweepSpace(PagedSpace* space, SweeperType sweeper) {
                    reinterpret_cast<intptr_t>(p));
           }
           p->parallel_sweeping_state().SetValue(MemoryChunk::kSweepingPending);
-          space->IncreaseUnsweptFreeBytes(p);
+          intptr_t to_sweep = p->area_size() - p->LiveBytes();
+          space->accounting_stats_.DeallocateBytes(to_sweep);

[ulan, 2015/10/01 15:57:28]

Use ShrinkSpace here?

[Michael Lippautz, 2015/10/01 16:22:35]

Done.

+          space->accounting_stats_.DecreaseCapacity(to_sweep);
         }
         space->set_end_of_unswept_pages(p);
         break;