src/hotspot/share/gc/cms/cmsHeap.cpp

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

*** 49,74 ****
      CollectedMemoryPool(name, space->capacity(), max_size, support_usage_threshold),
      _space(space) {
    }
  
    MemoryUsage get_memory_usage() {
!     size_t maxSize   = (available_for_allocation() ? max_size() : 0);
      size_t used      = used_in_bytes();
      size_t committed = _space->capacity();
  
!     return MemoryUsage(initial_size(), used, committed, maxSize);
    }
  
    size_t used_in_bytes() {
      return _space->used();
    }
  };
  
  CMSHeap::CMSHeap(GenCollectorPolicy *policy) :
    GenCollectedHeap(policy), _eden_pool(NULL), _survivor_pool(NULL), _old_pool(NULL) {
!   _young_mgr = new GCMemoryManager("ParNew", "end of minor GC");
!   _old_mgr = new GCMemoryManager("ConcurrentMarkSweep", "end of major GC");
  
    _workers = new WorkGang("GC Thread", ParallelGCThreads,
                            /* are_GC_task_threads */true,
                            /* are_ConcurrentGC_threads */false);
    _workers->initialize_workers();
--- 49,74 ----
      CollectedMemoryPool(name, space->capacity(), max_size, support_usage_threshold),
      _space(space) {
    }
  
    MemoryUsage get_memory_usage() {
!     size_t max_heap_size   = (available_for_allocation() ? max_size() : 0);
      size_t used      = used_in_bytes();
      size_t committed = _space->capacity();
  
!     return MemoryUsage(initial_size(), used, committed, max_heap_size);
    }
  
    size_t used_in_bytes() {
      return _space->used();
    }
  };
  
  CMSHeap::CMSHeap(GenCollectorPolicy *policy) :
    GenCollectedHeap(policy), _eden_pool(NULL), _survivor_pool(NULL), _old_pool(NULL) {
!   _young_manager = new GCMemoryManager("ParNew", "end of minor GC");
!   _old_manager = new GCMemoryManager("ConcurrentMarkSweep", "end of major GC");
  
    _workers = new WorkGang("GC Thread", ParallelGCThreads,
                            /* are_GC_task_threads */true,
                            /* are_ConcurrentGC_threads */false);
    _workers->initialize_workers();
*** 100,115 ****
    _old_pool = new CompactibleFreeListSpacePool(old->cmsSpace(),
                                                 "CMS Old Gen",
                                                 old->reserved().byte_size(),
                                                 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 CMSHeap::check_gen_kinds() {
--- 100,117 ----
    _old_pool = new CompactibleFreeListSpacePool(old->cmsSpace(),
                                                 "CMS Old Gen",
                                                 old->reserved().byte_size(),
                                                 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 CMSHeap::check_gen_kinds() {
*** 242,253 ****
    always_do_update_barrier = true;
  };
  
  GrowableArray<GCMemoryManager*> CMSHeap::memory_managers() {
    GrowableArray<GCMemoryManager*> memory_managers(2);
!   memory_managers.append(_young_mgr);
!   memory_managers.append(_old_mgr);
    return memory_managers;
  }
  
  GrowableArray<MemoryPool*> CMSHeap::memory_pools() {
    GrowableArray<MemoryPool*> memory_pools(3);
--- 244,255 ----
    always_do_update_barrier = true;
  };
  
  GrowableArray<GCMemoryManager*> CMSHeap::memory_managers() {
    GrowableArray<GCMemoryManager*> memory_managers(2);
!   memory_managers.append(_young_manager);
!   memory_managers.append(_old_manager);
    return memory_managers;
  }
  
  GrowableArray<MemoryPool*> CMSHeap::memory_pools() {
    GrowableArray<MemoryPool*> memory_pools(3);