Fri, 04 Dec 2009 07:44:41 -0500
6906565: G1: deal with compilation warning in g1MemoryPool.hpp
Summary: size_t max_size() hides size_t max_size() const.
Reviewed-by: jmasa, ysr
tonyp@1524 | 1 | /* |
tonyp@1524 | 2 | * Copyright (c) 2007 Sun Microsystems, Inc. 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 | * |
tonyp@1524 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
tonyp@1524 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
tonyp@1524 | 21 | * have any questions. |
tonyp@1524 | 22 | * |
tonyp@1524 | 23 | */ |
tonyp@1524 | 24 | |
tonyp@1524 | 25 | # include "incls/_precompiled.incl" |
tonyp@1524 | 26 | # include "incls/_g1MemoryPool.cpp.incl" |
tonyp@1524 | 27 | |
tonyp@1524 | 28 | G1MemoryPoolSuper::G1MemoryPoolSuper(G1CollectedHeap* g1h, |
tonyp@1524 | 29 | const char* name, |
tonyp@1524 | 30 | size_t init_size, |
tonyp@1524 | 31 | size_t max_size, |
tonyp@1524 | 32 | bool support_usage_threshold) : |
tonyp@1524 | 33 | _g1h(g1h), CollectedMemoryPool(name, |
tonyp@1524 | 34 | MemoryPool::Heap, |
tonyp@1524 | 35 | init_size, |
tonyp@1524 | 36 | max_size, |
tonyp@1524 | 37 | support_usage_threshold) { |
tonyp@1524 | 38 | assert(UseG1GC, "sanity"); |
tonyp@1524 | 39 | } |
tonyp@1524 | 40 | |
tonyp@1524 | 41 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 42 | size_t G1MemoryPoolSuper::eden_space_committed(G1CollectedHeap* g1h) { |
tonyp@1524 | 43 | return eden_space_used(g1h); |
tonyp@1524 | 44 | } |
tonyp@1524 | 45 | |
tonyp@1524 | 46 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 47 | size_t G1MemoryPoolSuper::eden_space_used(G1CollectedHeap* g1h) { |
tonyp@1524 | 48 | size_t young_list_length = g1h->young_list_length(); |
tonyp@1524 | 49 | size_t eden_used = young_list_length * HeapRegion::GrainBytes; |
tonyp@1524 | 50 | size_t survivor_used = survivor_space_used(g1h); |
tonyp@1524 | 51 | eden_used = subtract_up_to_zero(eden_used, survivor_used); |
tonyp@1524 | 52 | return eden_used; |
tonyp@1524 | 53 | } |
tonyp@1524 | 54 | |
tonyp@1524 | 55 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 56 | size_t G1MemoryPoolSuper::eden_space_max(G1CollectedHeap* g1h) { |
tonyp@1524 | 57 | return eden_space_committed(g1h); |
tonyp@1524 | 58 | } |
tonyp@1524 | 59 | |
tonyp@1524 | 60 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 61 | size_t G1MemoryPoolSuper::survivor_space_committed(G1CollectedHeap* g1h) { |
tonyp@1524 | 62 | return survivor_space_used(g1h); |
tonyp@1524 | 63 | } |
tonyp@1524 | 64 | |
tonyp@1524 | 65 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 66 | size_t G1MemoryPoolSuper::survivor_space_used(G1CollectedHeap* g1h) { |
tonyp@1524 | 67 | size_t survivor_num = g1h->g1_policy()->recorded_survivor_regions(); |
tonyp@1524 | 68 | size_t survivor_used = survivor_num * HeapRegion::GrainBytes; |
tonyp@1524 | 69 | return survivor_used; |
tonyp@1524 | 70 | } |
tonyp@1524 | 71 | |
tonyp@1524 | 72 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 73 | size_t G1MemoryPoolSuper::survivor_space_max(G1CollectedHeap* g1h) { |
tonyp@1524 | 74 | return survivor_space_committed(g1h); |
tonyp@1524 | 75 | } |
tonyp@1524 | 76 | |
tonyp@1524 | 77 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 78 | size_t G1MemoryPoolSuper::old_space_committed(G1CollectedHeap* g1h) { |
tonyp@1524 | 79 | size_t committed = overall_committed(g1h); |
tonyp@1524 | 80 | size_t eden_committed = eden_space_committed(g1h); |
tonyp@1524 | 81 | size_t survivor_committed = survivor_space_committed(g1h); |
tonyp@1524 | 82 | committed = subtract_up_to_zero(committed, eden_committed); |
tonyp@1524 | 83 | committed = subtract_up_to_zero(committed, survivor_committed); |
tonyp@1524 | 84 | return committed; |
tonyp@1524 | 85 | } |
tonyp@1524 | 86 | |
tonyp@1524 | 87 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 88 | size_t G1MemoryPoolSuper::old_space_used(G1CollectedHeap* g1h) { |
tonyp@1524 | 89 | size_t used = overall_used(g1h); |
tonyp@1524 | 90 | size_t eden_used = eden_space_used(g1h); |
tonyp@1524 | 91 | size_t survivor_used = survivor_space_used(g1h); |
tonyp@1524 | 92 | used = subtract_up_to_zero(used, eden_used); |
tonyp@1524 | 93 | used = subtract_up_to_zero(used, survivor_used); |
tonyp@1524 | 94 | return used; |
tonyp@1524 | 95 | } |
tonyp@1524 | 96 | |
tonyp@1524 | 97 | // See the comment at the top of g1MemoryPool.hpp |
tonyp@1524 | 98 | size_t G1MemoryPoolSuper::old_space_max(G1CollectedHeap* g1h) { |
tonyp@1527 | 99 | size_t max = overall_max(g1h); |
tonyp@1524 | 100 | size_t eden_max = eden_space_max(g1h); |
tonyp@1524 | 101 | size_t survivor_max = survivor_space_max(g1h); |
tonyp@1524 | 102 | max = subtract_up_to_zero(max, eden_max); |
tonyp@1524 | 103 | max = subtract_up_to_zero(max, survivor_max); |
tonyp@1524 | 104 | return max; |
tonyp@1524 | 105 | } |
tonyp@1524 | 106 | |
tonyp@1524 | 107 | G1EdenPool::G1EdenPool(G1CollectedHeap* g1h) : |
tonyp@1524 | 108 | G1MemoryPoolSuper(g1h, |
tonyp@1524 | 109 | "G1 Eden", |
tonyp@1524 | 110 | eden_space_committed(g1h), /* init_size */ |
tonyp@1524 | 111 | eden_space_max(g1h), /* max_size */ |
tonyp@1524 | 112 | false /* support_usage_threshold */) { |
tonyp@1524 | 113 | } |
tonyp@1524 | 114 | |
tonyp@1524 | 115 | MemoryUsage G1EdenPool::get_memory_usage() { |
tonyp@1527 | 116 | size_t initial_sz = initial_size(); |
tonyp@1527 | 117 | size_t max_sz = max_size(); |
tonyp@1527 | 118 | size_t used = used_in_bytes(); |
tonyp@1528 | 119 | size_t committed = eden_space_committed(_g1h); |
tonyp@1524 | 120 | |
tonyp@1527 | 121 | return MemoryUsage(initial_sz, used, committed, max_sz); |
tonyp@1524 | 122 | } |
tonyp@1524 | 123 | |
tonyp@1524 | 124 | G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h) : |
tonyp@1524 | 125 | G1MemoryPoolSuper(g1h, |
tonyp@1524 | 126 | "G1 Survivor", |
tonyp@1524 | 127 | survivor_space_committed(g1h), /* init_size */ |
tonyp@1524 | 128 | survivor_space_max(g1h), /* max_size */ |
tonyp@1524 | 129 | false /* support_usage_threshold */) { |
tonyp@1524 | 130 | } |
tonyp@1524 | 131 | |
tonyp@1524 | 132 | MemoryUsage G1SurvivorPool::get_memory_usage() { |
tonyp@1527 | 133 | size_t initial_sz = initial_size(); |
tonyp@1527 | 134 | size_t max_sz = max_size(); |
tonyp@1527 | 135 | size_t used = used_in_bytes(); |
tonyp@1528 | 136 | size_t committed = survivor_space_committed(_g1h); |
tonyp@1524 | 137 | |
tonyp@1527 | 138 | return MemoryUsage(initial_sz, used, committed, max_sz); |
tonyp@1524 | 139 | } |
tonyp@1524 | 140 | |
tonyp@1524 | 141 | G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) : |
tonyp@1524 | 142 | G1MemoryPoolSuper(g1h, |
tonyp@1524 | 143 | "G1 Old Gen", |
tonyp@1524 | 144 | old_space_committed(g1h), /* init_size */ |
tonyp@1524 | 145 | old_space_max(g1h), /* max_size */ |
tonyp@1524 | 146 | true /* support_usage_threshold */) { |
tonyp@1524 | 147 | } |
tonyp@1524 | 148 | |
tonyp@1524 | 149 | MemoryUsage G1OldGenPool::get_memory_usage() { |
tonyp@1527 | 150 | size_t initial_sz = initial_size(); |
tonyp@1527 | 151 | size_t max_sz = max_size(); |
tonyp@1527 | 152 | size_t used = used_in_bytes(); |
tonyp@1528 | 153 | size_t committed = old_space_committed(_g1h); |
tonyp@1524 | 154 | |
tonyp@1527 | 155 | return MemoryUsage(initial_sz, used, committed, max_sz); |
tonyp@1524 | 156 | } |