Add Heap::isolate_ to simplify code.

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 107 matching lines @@
 
 
 PageSpace::PageSpace(Heap* heap, intptr_t max_capacity_in_words)
     : freelist_(),
       heap_(heap),
       pages_(NULL),
       pages_tail_(NULL),
       large_pages_(NULL),
       max_capacity_in_words_(max_capacity_in_words),
       sweeping_(false),
-      page_space_controller_(FLAG_heap_growth_space_ratio,
+      page_space_controller_(heap,
+                             FLAG_heap_growth_space_ratio,
                              FLAG_heap_growth_rate,
                              FLAG_heap_growth_time_ratio),
       gc_time_micros_(0),
       collections_(0) {
 }
 
 
 PageSpace::~PageSpace() {
   FreePages(pages_);
   FreePages(large_pages_);
@@ skipping 487 matching lines @@
     heap_->Verify();
     OS::PrintErr(" done.\n");
   }
 
   // Done, reset the marker.
   ASSERT(sweeping_);
   sweeping_ = false;
 }
 
 
-PageSpaceController::PageSpaceController(int heap_growth_ratio,
+PageSpaceController::PageSpaceController(Heap* heap,
+                                         int heap_growth_ratio,
                                          int heap_growth_max,
                                          int garbage_collection_time_ratio)
-    : is_enabled_(false),
+    : heap_(heap),
+      is_enabled_(false),
       grow_heap_(heap_growth_max / 2),
       heap_growth_ratio_(heap_growth_ratio),
       desired_utilization_((100.0 - heap_growth_ratio) / 100.0),
       heap_growth_max_(heap_growth_max),
       garbage_collection_time_ratio_(garbage_collection_time_ratio),
       last_code_collection_in_us_(OS::GetCurrentTimeMicros()) {
 }
 
 
 PageSpaceController::~PageSpaceController() {}
@@ skipping 12 matching lines @@
   capacity_increase_in_words =
       Utils::RoundUp(capacity_increase_in_words, PageSpace::kPageSizeInWords);
   intptr_t capacity_increase_in_pages =
       capacity_increase_in_words / PageSpace::kPageSizeInWords;
   double multiplier = 1.0;
   // To avoid waste, the first GC should be triggered before too long. After
   // kInitialTimeoutSeconds, gradually lower the capacity limit.
   static const double kInitialTimeoutSeconds = 1.00;
   if (history_.IsEmpty()) {
     double seconds_since_init = MicrosecondsToSeconds(
-        OS::GetCurrentTimeMicros() - Isolate::Current()->start_time());
+        OS::GetCurrentTimeMicros() - heap_->isolate()->start_time());
     if (seconds_since_init > kInitialTimeoutSeconds) {
       multiplier *= seconds_since_init / kInitialTimeoutSeconds;
     }
   }
   return capacity_increase_in_pages * multiplier > grow_heap_;
 }
 
 
 void PageSpaceController::EvaluateGarbageCollection(
     SpaceUsage before, SpaceUsage after, int64_t start, int64_t end) {
-  Heap* heap = Isolate::Current()->heap();
   ASSERT(end >= start);
   history_.AddGarbageCollectionTime(start, end);
   int gc_time_fraction = history_.GarbageCollectionTimeFraction();
-  heap->RecordData(PageSpace::kGCTimeFraction, gc_time_fraction);
+  heap_->RecordData(PageSpace::kGCTimeFraction, gc_time_fraction);
 
   // Assume garbage increases linearly with allocation:
   // G = kA, and estimate k from the previous cycle.
   intptr_t allocated_since_previous_gc =
       before.used_in_words - last_usage_.used_in_words;
   intptr_t garbage = before.used_in_words - after.used_in_words;
   double k = garbage / static_cast<double>(allocated_since_previous_gc);
-  heap->RecordData(PageSpace::kGarbageRatio, static_cast<int>(k * 100));
+  heap_->RecordData(PageSpace::kGarbageRatio, static_cast<int>(k * 100));
 
   // Define GC to be 'worthwhile' iff at least fraction t of heap is garbage.
   double t = 1.0 - desired_utilization_;
   // If we spend too much time in GC, strive for even more free space.
   if (gc_time_fraction > garbage_collection_time_ratio_) {
     t += (gc_time_fraction - garbage_collection_time_ratio_) / 100.0;
   }
 
   // Find minimum 'grow_heap_' such that after increasing capacity by
   // 'grow_heap_' pages and filling them, we expect a GC to be worthwhile.
   for (grow_heap_ = 0; grow_heap_ < heap_growth_max_; ++grow_heap_) {
     intptr_t limit =
         after.capacity_in_words + (grow_heap_ * PageSpace::kPageSizeInWords);
     intptr_t allocated_before_next_gc = limit - after.used_in_words;
     double estimated_garbage = k * allocated_before_next_gc;
     if (t <= estimated_garbage / limit) {
       break;
     }
   }
-  heap->RecordData(PageSpace::kPageGrowth, grow_heap_);
+  heap_->RecordData(PageSpace::kPageGrowth, grow_heap_);
 
   // Limit shrinkage: allow growth by at least half the pages freed by GC.
   intptr_t freed_pages =
       (before.capacity_in_words - after.capacity_in_words) /
       PageSpace::kPageSizeInWords;
   grow_heap_ = Utils::Maximum(grow_heap_, freed_pages / 2);
-  heap->RecordData(PageSpace::kAllowedGrowth, grow_heap_);
+  heap_->RecordData(PageSpace::kAllowedGrowth, grow_heap_);
   last_usage_ = after;
 }
 
 
 void PageSpaceGarbageCollectionHistory::
     AddGarbageCollectionTime(int64_t start, int64_t end) {
   Entry entry;
   entry.start = start;
   entry.end = end;
   history_.Add(entry);
@@ skipping 13 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