• file
• revisions
• annotate
• diff
• comparison
• raw

src/share/vm/services/g1MemoryPool.cpp@114e52976463 (annotated)

src/share/vm/services/g1MemoryPool.cpp

Wed, 21 Sep 2011 01:27:20 -0400

author

tonyp

date

Wed, 21 Sep 2011 01:27:20 -0400

changeset 3170

114e52976463

parent 2821

b52782ae3880

child 3176

8229bd737950

permissions

-rw-r--r--

7045232: G1: pool names are inconsistent with other collectors (don't have 'Space')
Summary: Make sure the eden and survivor pools have "Space" in their name.
Reviewed-by: jmasa, ysr

tonyp@1524	1	/*
jmasa@2821	2	* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
tonyp@1524	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
tonyp@1524	4	*
tonyp@1524	5	* This code is free software; you can redistribute it and/or modify it
tonyp@1524	6	* under the terms of the GNU General Public License version 2 only, as
tonyp@1524	7	* published by the Free Software Foundation.
tonyp@1524	8	*
tonyp@1524	9	* This code is distributed in the hope that it will be useful, but WITHOUT
tonyp@1524	10	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
tonyp@1524	11	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
tonyp@1524	12	* version 2 for more details (a copy is included in the LICENSE file that
tonyp@1524	13	* accompanied this code).
tonyp@1524	14	*
tonyp@1524	15	* You should have received a copy of the GNU General Public License version
tonyp@1524	16	* 2 along with this work; if not, write to the Free Software Foundation,
tonyp@1524	17	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
tonyp@1524	18	*
trims@1907	19	* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
trims@1907	20	* or visit www.oracle.com if you need additional information or have any
trims@1907	21	* questions.
tonyp@1524	22	*
tonyp@1524	23	*/
tonyp@1524	24
stefank@2314	25	#include "precompiled.hpp"
stefank@2314	26	#include "gc_implementation/g1/g1CollectedHeap.hpp"
stefank@2314	27	#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
stefank@2314	28	#include "gc_implementation/g1/g1CollectorPolicy.hpp"
stefank@2314	29	#include "gc_implementation/g1/heapRegion.hpp"
stefank@2314	30	#include "services/g1MemoryPool.hpp"
tonyp@1524	31
tonyp@1524	32	G1MemoryPoolSuper::G1MemoryPoolSuper(G1CollectedHeap* g1h,
tonyp@1524	33	const char* name,
tonyp@1524	34	size_t init_size,
tonyp@1524	35	bool support_usage_threshold) :
tonyp@1524	36	_g1h(g1h), CollectedMemoryPool(name,
jmasa@2821	37	MemoryPool::Heap,
jmasa@2821	38	init_size,
jmasa@2821	39	undefined_max(),
jmasa@2821	40	support_usage_threshold) {
tonyp@1524	41	assert(UseG1GC, "sanity");
tonyp@1524	42	}
tonyp@1524	43
tonyp@1524	44	// See the comment at the top of g1MemoryPool.hpp
tonyp@1524	45	size_t G1MemoryPoolSuper::eden_space_committed(G1CollectedHeap* g1h) {
tonyp@1529	46	return MAX2(eden_space_used(g1h), (size_t) HeapRegion::GrainBytes);
tonyp@1524	47	}
tonyp@1524	48
tonyp@1524	49	// See the comment at the top of g1MemoryPool.hpp
tonyp@1524	50	size_t G1MemoryPoolSuper::eden_space_used(G1CollectedHeap* g1h) {
jmasa@2821	51	return g1h->g1mm()->eden_space_used();
tonyp@1524	52	}
tonyp@1524	53
tonyp@1524	54	// See the comment at the top of g1MemoryPool.hpp
tonyp@1524	55	size_t G1MemoryPoolSuper::survivor_space_committed(G1CollectedHeap* g1h) {
jmasa@2821	56	return g1h->g1mm()->survivor_space_committed();
tonyp@1524	57	}
tonyp@1524	58
tonyp@1524	59	// See the comment at the top of g1MemoryPool.hpp
tonyp@1524	60	size_t G1MemoryPoolSuper::survivor_space_used(G1CollectedHeap* g1h) {
jmasa@2821	61	return g1h->g1mm()->survivor_space_used();
tonyp@1524	62	}
tonyp@1524	63
tonyp@1524	64	// See the comment at the top of g1MemoryPool.hpp
tonyp@1524	65	size_t G1MemoryPoolSuper::old_space_committed(G1CollectedHeap* g1h) {
jmasa@2821	66	return g1h->g1mm()->old_space_committed();
tonyp@1524	67	}
tonyp@1524	68
tonyp@1524	69	// See the comment at the top of g1MemoryPool.hpp
tonyp@1524	70	size_t G1MemoryPoolSuper::old_space_used(G1CollectedHeap* g1h) {
jmasa@2821	71	return g1h->g1mm()->old_space_used();
tonyp@1524	72	}
tonyp@1524	73
tonyp@1524	74	G1EdenPool::G1EdenPool(G1CollectedHeap* g1h) :
tonyp@1524	75	G1MemoryPoolSuper(g1h,
tonyp@3170	76	"G1 Eden Space",
tonyp@1524	77	eden_space_committed(g1h), /* init_size */
tonyp@2109	78	false /* support_usage_threshold */) { }
tonyp@1524	79
tonyp@1524	80	MemoryUsage G1EdenPool::get_memory_usage() {
tonyp@1527	81	size_t initial_sz = initial_size();
tonyp@1527	82	size_t max_sz = max_size();
tonyp@1527	83	size_t used = used_in_bytes();
tonyp@1528	84	size_t committed = eden_space_committed(_g1h);
tonyp@1524	85
tonyp@1527	86	return MemoryUsage(initial_sz, used, committed, max_sz);
tonyp@1524	87	}
tonyp@1524	88
tonyp@1524	89	G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h) :
tonyp@1524	90	G1MemoryPoolSuper(g1h,
tonyp@3170	91	"G1 Survivor Space",
tonyp@1524	92	survivor_space_committed(g1h), /* init_size */
tonyp@2109	93	false /* support_usage_threshold */) { }
tonyp@1524	94
tonyp@1524	95	MemoryUsage G1SurvivorPool::get_memory_usage() {
tonyp@1527	96	size_t initial_sz = initial_size();
tonyp@1527	97	size_t max_sz = max_size();
tonyp@1527	98	size_t used = used_in_bytes();
tonyp@1528	99	size_t committed = survivor_space_committed(_g1h);
tonyp@1524	100
tonyp@1527	101	return MemoryUsage(initial_sz, used, committed, max_sz);
tonyp@1524	102	}
tonyp@1524	103
tonyp@1524	104	G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) :
tonyp@1524	105	G1MemoryPoolSuper(g1h,
tonyp@1524	106	"G1 Old Gen",
tonyp@1524	107	old_space_committed(g1h), /* init_size */
tonyp@2109	108	true /* support_usage_threshold */) { }
tonyp@1524	109
tonyp@1524	110	MemoryUsage G1OldGenPool::get_memory_usage() {
tonyp@1527	111	size_t initial_sz = initial_size();
tonyp@1527	112	size_t max_sz = max_size();
tonyp@1527	113	size_t used = used_in_bytes();
tonyp@1528	114	size_t committed = old_space_committed(_g1h);
tonyp@1524	115
tonyp@1527	116	return MemoryUsage(initial_sz, used, committed, max_sz);
tonyp@1524	117	}