src/share/vm/services/g1MemoryPool.cpp

Fri, 14 Jan 2011 13:47:53 -0500

author
coleenp
date
Fri, 14 Jan 2011 13:47:53 -0500
changeset 2463
17c778814856
parent 2314
f95d63e2154a
child 2821
b52782ae3880
permissions
-rw-r--r--

6811367: Fix code in HeapDumper::dump_heap() to avoid buffer overrun
Summary: Check buffer size before using and use dynamic buffer sizes for subsequent calls.
Reviewed-by: kamg, dholmes

tonyp@1524 1 /*
trims@1907 2 * Copyright (c) 2007, 2010, 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,
tonyp@1524 37 MemoryPool::Heap,
tonyp@1524 38 init_size,
tonyp@2109 39 undefined_max(),
tonyp@1524 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) {
johnc@1829 51 size_t young_list_length = g1h->young_list()->length();
tonyp@1524 52 size_t eden_used = young_list_length * HeapRegion::GrainBytes;
tonyp@1524 53 size_t survivor_used = survivor_space_used(g1h);
tonyp@1524 54 eden_used = subtract_up_to_zero(eden_used, survivor_used);
tonyp@1524 55 return eden_used;
tonyp@1524 56 }
tonyp@1524 57
tonyp@1524 58 // See the comment at the top of g1MemoryPool.hpp
tonyp@1524 59 size_t G1MemoryPoolSuper::survivor_space_committed(G1CollectedHeap* g1h) {
tonyp@1529 60 return MAX2(survivor_space_used(g1h), (size_t) HeapRegion::GrainBytes);
tonyp@1524 61 }
tonyp@1524 62
tonyp@1524 63 // See the comment at the top of g1MemoryPool.hpp
tonyp@1524 64 size_t G1MemoryPoolSuper::survivor_space_used(G1CollectedHeap* g1h) {
tonyp@1524 65 size_t survivor_num = g1h->g1_policy()->recorded_survivor_regions();
tonyp@1524 66 size_t survivor_used = survivor_num * HeapRegion::GrainBytes;
tonyp@1524 67 return survivor_used;
tonyp@1524 68 }
tonyp@1524 69
tonyp@1524 70 // See the comment at the top of g1MemoryPool.hpp
tonyp@1524 71 size_t G1MemoryPoolSuper::old_space_committed(G1CollectedHeap* g1h) {
tonyp@1524 72 size_t committed = overall_committed(g1h);
tonyp@1524 73 size_t eden_committed = eden_space_committed(g1h);
tonyp@1524 74 size_t survivor_committed = survivor_space_committed(g1h);
tonyp@1524 75 committed = subtract_up_to_zero(committed, eden_committed);
tonyp@1524 76 committed = subtract_up_to_zero(committed, survivor_committed);
tonyp@1529 77 committed = MAX2(committed, (size_t) HeapRegion::GrainBytes);
tonyp@1524 78 return committed;
tonyp@1524 79 }
tonyp@1524 80
tonyp@1524 81 // See the comment at the top of g1MemoryPool.hpp
tonyp@1524 82 size_t G1MemoryPoolSuper::old_space_used(G1CollectedHeap* g1h) {
tonyp@1524 83 size_t used = overall_used(g1h);
tonyp@1524 84 size_t eden_used = eden_space_used(g1h);
tonyp@1524 85 size_t survivor_used = survivor_space_used(g1h);
tonyp@1524 86 used = subtract_up_to_zero(used, eden_used);
tonyp@1524 87 used = subtract_up_to_zero(used, survivor_used);
tonyp@1524 88 return used;
tonyp@1524 89 }
tonyp@1524 90
tonyp@1524 91 G1EdenPool::G1EdenPool(G1CollectedHeap* g1h) :
tonyp@1524 92 G1MemoryPoolSuper(g1h,
tonyp@1524 93 "G1 Eden",
tonyp@1524 94 eden_space_committed(g1h), /* init_size */
tonyp@2109 95 false /* support_usage_threshold */) { }
tonyp@1524 96
tonyp@1524 97 MemoryUsage G1EdenPool::get_memory_usage() {
tonyp@1527 98 size_t initial_sz = initial_size();
tonyp@1527 99 size_t max_sz = max_size();
tonyp@1527 100 size_t used = used_in_bytes();
tonyp@1528 101 size_t committed = eden_space_committed(_g1h);
tonyp@1524 102
tonyp@1527 103 return MemoryUsage(initial_sz, used, committed, max_sz);
tonyp@1524 104 }
tonyp@1524 105
tonyp@1524 106 G1SurvivorPool::G1SurvivorPool(G1CollectedHeap* g1h) :
tonyp@1524 107 G1MemoryPoolSuper(g1h,
tonyp@1524 108 "G1 Survivor",
tonyp@1524 109 survivor_space_committed(g1h), /* init_size */
tonyp@2109 110 false /* support_usage_threshold */) { }
tonyp@1524 111
tonyp@1524 112 MemoryUsage G1SurvivorPool::get_memory_usage() {
tonyp@1527 113 size_t initial_sz = initial_size();
tonyp@1527 114 size_t max_sz = max_size();
tonyp@1527 115 size_t used = used_in_bytes();
tonyp@1528 116 size_t committed = survivor_space_committed(_g1h);
tonyp@1524 117
tonyp@1527 118 return MemoryUsage(initial_sz, used, committed, max_sz);
tonyp@1524 119 }
tonyp@1524 120
tonyp@1524 121 G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) :
tonyp@1524 122 G1MemoryPoolSuper(g1h,
tonyp@1524 123 "G1 Old Gen",
tonyp@1524 124 old_space_committed(g1h), /* init_size */
tonyp@2109 125 true /* support_usage_threshold */) { }
tonyp@1524 126
tonyp@1524 127 MemoryUsage G1OldGenPool::get_memory_usage() {
tonyp@1527 128 size_t initial_sz = initial_size();
tonyp@1527 129 size_t max_sz = max_size();
tonyp@1527 130 size_t used = used_in_bytes();
tonyp@1528 131 size_t committed = old_space_committed(_g1h);
tonyp@1524 132
tonyp@1527 133 return MemoryUsage(initial_sz, used, committed, max_sz);
tonyp@1524 134 }

mercurial