src/hotspot/share/gc/serial/serialHeap.cpp

rev 48000 : [mq]: open.patch
rev 48001 : [mq]: 8191564-new.patch

*** 28,39 ****
  #include "gc/shared/genMemoryPools.hpp"
  #include "services/memoryManager.hpp"
  
  SerialHeap::SerialHeap(GenCollectorPolicy* policy) :
    GenCollectedHeap(policy), _eden_pool(NULL), _survivor_pool(NULL), _old_pool(NULL) {
!   _young_mgr = new GCMemoryManager("Copy", "end of minor GC");
!   _old_mgr = new GCMemoryManager("MarkSweepCompact", "end of major GC");
  }
  
  jint SerialHeap::initialize() {
    jint status = GenCollectedHeap::initialize();
    if (status != JNI_OK) return status;
--- 28,39 ----
  #include "gc/shared/genMemoryPools.hpp"
  #include "services/memoryManager.hpp"
  
  SerialHeap::SerialHeap(GenCollectorPolicy* policy) :
    GenCollectedHeap(policy), _eden_pool(NULL), _survivor_pool(NULL), _old_pool(NULL) {
!   _young_manager = new GCMemoryManager("Copy", "end of minor GC");
!   _old_manager = new GCMemoryManager("MarkSweepCompact", "end of major GC");
  }
  
  jint SerialHeap::initialize() {
    jint status = GenCollectedHeap::initialize();
    if (status != JNI_OK) return status;
*** 48,65 ****
                                               false /* support_usage_threshold */);
    _survivor_pool = new SurvivorContiguousSpacePool(young,
                                                     "Survivor Space",
                                                     young->max_survivor_size(),
                                                     false /* support_usage_threshold */);
!   _old_pool = new GenerationPool(old_gen(), "Tenured Gen", true);
  
!   _young_mgr->add_pool(_eden_pool);
!   _young_mgr->add_pool(_survivor_pool);
! 
!   _old_mgr->add_pool(_eden_pool);
!   _old_mgr->add_pool(_survivor_pool);
!   _old_mgr->add_pool(_old_pool);
  
    return JNI_OK;
  }
  
  void SerialHeap::check_gen_kinds() {
--- 48,68 ----
                                               false /* support_usage_threshold */);
    _survivor_pool = new SurvivorContiguousSpacePool(young,
                                                     "Survivor Space",
                                                     young->max_survivor_size(),
                                                     false /* support_usage_threshold */);
!   Generation* old = old_gen();
!   _old_pool = new GenerationPool(old, "Tenured Gen", true);
  
!   _young_manager->add_pool(_eden_pool);
!   _young_manager->add_pool(_survivor_pool);
!   young->set_gc_manager(_young_manager);
! 
!   _old_manager->add_pool(_eden_pool);
!   _old_manager->add_pool(_survivor_pool);
!   _old_manager->add_pool(_old_pool);
!   old->set_gc_manager(_old_manager);
  
    return JNI_OK;
  }
  
  void SerialHeap::check_gen_kinds() {
*** 69,80 ****
           "Wrong generation kind");
  }
  
  GrowableArray<GCMemoryManager*> SerialHeap::memory_managers() {
    GrowableArray<GCMemoryManager*> memory_managers(2);
!   memory_managers.append(_young_mgr);
!   memory_managers.append(_old_mgr);
    return memory_managers;
  }
  
  GrowableArray<MemoryPool*> SerialHeap::memory_pools() {
    GrowableArray<MemoryPool*> memory_pools(3);
--- 72,83 ----
           "Wrong generation kind");
  }
  
  GrowableArray<GCMemoryManager*> SerialHeap::memory_managers() {
    GrowableArray<GCMemoryManager*> memory_managers(2);
!   memory_managers.append(_young_manager);
!   memory_managers.append(_old_manager);
    return memory_managers;
  }
  
  GrowableArray<MemoryPool*> SerialHeap::memory_pools() {
    GrowableArray<MemoryPool*> memory_pools(3);