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