src/share/vm/services/memoryService.cpp

rev 7212 : [mq]: remove_get_gen
rev 7213 : imported patch move_genspecs
rev 7214 : imported patch remove_n_gen

*** 124,139 ****
  // The collector for GenCollectedHeap will have two memory managers.
  void MemoryService::add_gen_collected_heap_info(GenCollectedHeap* heap) {
    CollectorPolicy* policy = heap->collector_policy();
  
    assert(policy->is_generation_policy(), "Only support two generations");
-   guarantee(heap->n_gens() == 2, "Only support two-generation heap");
- 
    GenCollectorPolicy* gen_policy = policy->as_generation_policy();
    if (gen_policy != NULL) {
!     GenerationSpec** specs = gen_policy->generations();
!     Generation::Name kind = specs[0]->name();
      switch (kind) {
        case Generation::DefNew:
          _minor_gc_manager = MemoryManager::get_copy_memory_manager();
          break;
  #if INCLUDE_ALL_GCS
--- 124,137 ----
  // The collector for GenCollectedHeap will have two memory managers.
  void MemoryService::add_gen_collected_heap_info(GenCollectedHeap* heap) {
    CollectorPolicy* policy = heap->collector_policy();
  
    assert(policy->is_generation_policy(), "Only support two generations");
    GenCollectorPolicy* gen_policy = policy->as_generation_policy();
+   guarantee(gen_policy->number_of_generations() == 2, "Only support two-generation heap");
    if (gen_policy != NULL) {
!     Generation::Name kind = gen_policy->young_gen_spec()->name();
      switch (kind) {
        case Generation::DefNew:
          _minor_gc_manager = MemoryManager::get_copy_memory_manager();
          break;
  #if INCLUDE_ALL_GCS
*** 158,169 ****
      guarantee(false, "Non two-gen policy");
    }
    _managers_list->append(_minor_gc_manager);
    _managers_list->append(_major_gc_manager);
  
!   add_generation_memory_pool(heap->get_gen(minor), _major_gc_manager, _minor_gc_manager);
!   add_generation_memory_pool(heap->get_gen(major), _major_gc_manager);
  }
  
  #if INCLUDE_ALL_GCS
  // Add memory pools for ParallelScavengeHeap
  // This function currently only supports two generations collected heap.
--- 156,167 ----
      guarantee(false, "Non two-gen policy");
    }
    _managers_list->append(_minor_gc_manager);
    _managers_list->append(_major_gc_manager);
  
!   add_generation_memory_pool(heap->young_gen(), _major_gc_manager, _minor_gc_manager);
!   add_generation_memory_pool(heap->old_gen(), _major_gc_manager);
  }
  
  #if INCLUDE_ALL_GCS
  // Add memory pools for ParallelScavengeHeap
  // This function currently only supports two generations collected heap.