src/share/vm/memory/collectorPolicy.cpp

rev 5146 : imported patch first-patch

*** 143,152 ****
--- 143,176 ----
      _should_clear_all_soft_refs = size_policy()->gc_overhead_limit_near();
    }
    _all_soft_refs_clear = true;
  }
  
+ size_t CollectorPolicy::compute_largest_heap_alignment() {
+   // The card marking array and the offset arrays for old generations are
+   // committed in os pages as well. Make sure they are entirely full (to
+   // avoid partial page problems), e.g. if 512 bytes heap corresponds to 1
+   // byte entry and the os page size is 4096, the maximum heap size should
+   // be 512*4096 = 2MB aligned.
+ 
+   // there is only the GenRemSet in Hotspot and only the GenRemSet::CardTable
+   // is supported.
+   // Requirements of any new remembered set implementations must be added here.
+   size_t alignment = GenRemSet::max_alignment_constraint(GenRemSet::CardTable);
+ 
+   // Parallel GC does its own alignment of the generations to avoid requiring a
+   // large page (256M on some platforms) for the permanent generation.  The
+   // other collectors should also be updated to do their own alignment and then
+   // this use of lcm() should be removed.
+   if (UseLargePages && !UseParallelGC) {
+       // in presence of large pages we have to make sure that our
+       // alignment is large page aware
+       alignment = lcm(os::large_page_size(), alignment);
+   }
+ 
+   return alignment;
+ }
  
  // GenCollectorPolicy methods.
  
  size_t GenCollectorPolicy::scale_by_NewRatio_aligned(size_t base_size) {
    size_t x = base_size / (NewRatio+1);
*** 173,209 ****
                                          init_survivor_size,
                                          max_gc_pause_sec,
                                          GCTimeRatio);
  }
  
- size_t GenCollectorPolicy::compute_max_alignment() {
-   // The card marking array and the offset arrays for old generations are
-   // committed in os pages as well. Make sure they are entirely full (to
-   // avoid partial page problems), e.g. if 512 bytes heap corresponds to 1
-   // byte entry and the os page size is 4096, the maximum heap size should
-   // be 512*4096 = 2MB aligned.
-   size_t alignment = GenRemSet::max_alignment_constraint(rem_set_name());
- 
-   // Parallel GC does its own alignment of the generations to avoid requiring a
-   // large page (256M on some platforms) for the permanent generation.  The
-   // other collectors should also be updated to do their own alignment and then
-   // this use of lcm() should be removed.
-   if (UseLargePages && !UseParallelGC) {
-       // in presence of large pages we have to make sure that our
-       // alignment is large page aware
-       alignment = lcm(os::large_page_size(), alignment);
-   }
- 
-   assert(alignment >= min_alignment(), "Must be");
- 
-   return alignment;
- }
- 
  void GenCollectorPolicy::initialize_flags() {
    // All sizes must be multiples of the generation granularity.
    set_min_alignment((uintx) Generation::GenGrain);
!   set_max_alignment(compute_max_alignment());
  
    CollectorPolicy::initialize_flags();
  
    // All generational heaps have a youngest gen; handle those flags here.
  
--- 197,210 ----
                                          init_survivor_size,
                                          max_gc_pause_sec,
                                          GCTimeRatio);
  }
  
  void GenCollectorPolicy::initialize_flags() {
    // All sizes must be multiples of the generation granularity.
    set_min_alignment((uintx) Generation::GenGrain);
!   set_max_alignment(compute_largest_heap_alignment());
  
    CollectorPolicy::initialize_flags();
  
    // All generational heaps have a youngest gen; handle those flags here.