- Account for live size in marker.

runtime/vm/pages.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/pages.h"
 
 #include "platform/assert.h"
 #include "vm/compiler_stats.h"
 #include "vm/gc_marker.h"
 #include "vm/gc_sweeper.h"
@@ skipping 517 matching lines @@
     while (current_page != NULL) {
       if (current_page->type() == HeapPage::kExecutable) {
         current_page->WriteProtect(false);
       }
       current_page = current_page->next();
     }
   }
 
   // Save old value before GCMarker visits the weak persistent handles.
   SpaceUsage usage_before = usage_;
   usage_.used_in_words = 0;

[koda, 2014/04/24 23:09:56]

This should be redundant now; remove.

[Ivan Posva, 2014/04/24 23:17:50]

Done.

 
   // Mark all reachable old-gen objects.
   bool collect_code = FLAG_collect_code && ShouldCollectCode();
   GCMarker marker(heap_);
   marker.MarkObjects(isolate, this, invoke_api_callbacks, collect_code);
+  usage_.used_in_words = marker.marked_words();
 
   int64_t mid1 = OS::GetCurrentTimeMicros();
 
   // Reset the bump allocation page to unused.
   // Reset the freelists and setup sweeping.
   freelist_[HeapPage::kData].Reset();
   freelist_[HeapPage::kExecutable].Reset();
 
   int64_t mid2 = OS::GetCurrentTimeMicros();
 
   GCSweeper sweeper(heap_);
 
   HeapPage* prev_page = NULL;
   HeapPage* page = pages_;
   while (page != NULL) {
     HeapPage* next_page = page->next();
-    intptr_t page_in_use = sweeper.SweepPage(page, &freelist_[page->type()]);
-    if (page_in_use == 0) {
+    if (sweeper.SweepPage(page, &freelist_[page->type()])) {

[koda, 2014/04/24 23:09:56]

Consider helping the reader remember what the return value means:

bool page_in_use = ...
if (page_in_use) {
...

[Ivan Posva, 2014/04/24 23:17:50]

Done.

+      prev_page = page;
+    } else {
       FreePage(page, prev_page);
-    } else {
-      usage_.used_in_words += (page_in_use >> kWordSizeLog2);
-      prev_page = page;
     }
     // Advance to the next page.
     page = next_page;
   }
 
   int64_t mid3 = OS::GetCurrentTimeMicros();
 
   prev_page = NULL;
   page = large_pages_;
   while (page != NULL) {
-    intptr_t page_in_use = sweeper.SweepLargePage(page);
     HeapPage* next_page = page->next();
-    if (page_in_use == 0) {
+    if (sweeper.SweepLargePage(page)) {
+      prev_page = page;
+    } else {
       FreeLargePage(page, prev_page);
-    } else {
-      usage_.used_in_words += (page_in_use >> kWordSizeLog2);
-      prev_page = page;
     }
     // Advance to the next page.
     page = next_page;
   }
 
   if (FLAG_write_protect_code) {
     // Make code pages read-only.
     HeapPage* current_page = pages_;
     while (current_page != NULL) {
       if (current_page->type() == HeapPage::kExecutable) {
@@ skipping 145 matching lines @@
     return 0;
   } else {
     ASSERT(total_time >= gc_time);
     int result= static_cast<int>((static_cast<double>(gc_time) /
                              static_cast<double>(total_time)) * 100);
     return result;
   }
 }
 
 }  // namespace dart