src/hotspot/share/gc/g1/g1MemoryPool.cpp

rev 51294 : imported patch 8208669-gc-reorder
rev 51303 : imported patch 8209062-cleanup-monitoringsupport
rev 51304 : [mq]: 8207200-getmemoryusage-consistency

*** 46,80 ****
                      initial_size,
                      MemoryUsage::undefined_size(),
                      false /* support_usage_threshold */) { }
  
  MemoryUsage G1EdenPool::get_memory_usage() {
!   size_t committed  = _g1mm->eden_space_committed();
! 
!   return MemoryUsage(initial_size(), used_in_bytes(), committed, max_size());
  }
  
  G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h, size_t initial_size) :
    G1MemoryPoolSuper(g1h,
                      "G1 Survivor Space",
                      initial_size,
                      MemoryUsage::undefined_size(),
                      false /* support_usage_threshold */) { }
  
  MemoryUsage G1SurvivorPool::get_memory_usage() {
!   size_t committed  = _g1mm->survivor_space_committed();
! 
!   return MemoryUsage(initial_size(), used_in_bytes(), committed, max_size());
  }
  
  G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h, size_t initial_size, size_t max_size) :
    G1MemoryPoolSuper(g1h,
                      "G1 Old Gen",
                      initial_size,
                      max_size,
                      true /* support_usage_threshold */) { }
  
  MemoryUsage G1OldGenPool::get_memory_usage() {
!   size_t committed  = _g1mm->old_gen_committed();
! 
!   return MemoryUsage(initial_size(), used_in_bytes(), committed, max_size());
  }
--- 46,74 ----
                      initial_size,
                      MemoryUsage::undefined_size(),
                      false /* support_usage_threshold */) { }
  
  MemoryUsage G1EdenPool::get_memory_usage() {
!   return _g1mm->eden_space_memory_usage(initial_size(), max_size());
  }
  
  G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h, size_t initial_size) :
    G1MemoryPoolSuper(g1h,
                      "G1 Survivor Space",
                      initial_size,
                      MemoryUsage::undefined_size(),
                      false /* support_usage_threshold */) { }
  
  MemoryUsage G1SurvivorPool::get_memory_usage() {
!   return _g1mm->survivor_space_memory_usage(initial_size(), max_size());
  }
  
  G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h, size_t initial_size, size_t max_size) :
    G1MemoryPoolSuper(g1h,
                      "G1 Old Gen",
                      initial_size,
                      max_size,
                      true /* support_usage_threshold */) { }
  
  MemoryUsage G1OldGenPool::get_memory_usage() {
!   return _g1mm->old_gen_memory_usage(initial_size(), max_size());
  }