Only sweep one page eagerly unless we are running out of space.

src/spaces.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1539 matching lines @@
 
   // Evacuation candidates are swept by evacuator.  Needs to return a valid
   // result before _and_ after evacuation has finished.
   static bool ShouldBeSweptLazily(Page* p) {
     return !p->IsEvacuationCandidate() &&
            !p->IsFlagSet(Page::RESCAN_ON_EVACUATION) &&
            !p->WasSweptPrecisely();
   }
 
   void SetPagesToSweep(Page* first) {
+    if (first == &anchor_) first = NULL;
     first_unswept_page_ = first;
   }
 
   bool AdvanceSweeper(intptr_t bytes_to_sweep);
 
   bool IsSweepingComplete() {
     return !first_unswept_page_->is_valid();
   }
 
   Page* FirstPage() { return anchor_.next_page(); }
   Page* LastPage() { return anchor_.prev_page(); }
 
-  bool IsFragmented(Page* p) {
+  int Fragmentation(Page* p) {

[Michael Starzinger, 2011/11/24 14:43:49]

A one-liner comment about the possible range of return values would be nice
here.

[Erik Corry, 2011/11/24 17:02:30]

Done.

     FreeList::SizeStats sizes;
     free_list_.CountFreeListItems(p, &sizes);
 
     intptr_t ratio;
     intptr_t ratio_threshold;
     if (identity() == CODE_SPACE) {
       ratio = (sizes.medium_size_ * 10 + sizes.large_size_ * 2) * 100 /
           Page::kObjectAreaSize;
       ratio_threshold = 10;
     } else {
@@ skipping 14 matching lines @@
                  Page::kObjectAreaSize,
              static_cast<int>(sizes.large_size_),
              static_cast<double>(sizes.large_size_ * 100) /
                  Page::kObjectAreaSize,
              static_cast<int>(sizes.huge_size_),
              static_cast<double>(sizes.huge_size_ * 100) /
                  Page::kObjectAreaSize,
              (ratio > ratio_threshold) ? "[fragmented]" : "");
     }
 
-    return (ratio > ratio_threshold) ||
-        (FLAG_always_compact && sizes.Total() != Page::kObjectAreaSize);
+    if (FLAG_always_compact && sizes.Total() != Page::kObjectAreaSize) {
+      return 1;
+    }
+    if (ratio <= ratio_threshold) return 0;  // Not fragmented.
+
+    return static_cast<int>(ratio - ratio_threshold);
   }
 
   void EvictEvacuationCandidatesFromFreeLists();
 
   bool CanExpand();
 
  protected:
   // Maximum capacity of this space.
   intptr_t max_capacity_;
 
@@ skipping 1004 matching lines @@
   }
   // Must be small, since an iteration is used for lookup.
   static const int kMaxComments = 64;
 };
 #endif
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SPACES_H_