Thu, 07 Aug 2014 22:28:53 +0200
8054341: Remove some obsolete code in G1CollectedHeap class
Summary: Remove dead code.
Reviewed-by: stefank, brutisso
ysr@777 | 1 | /* |
drchase@6680 | 2 | * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. |
ysr@777 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ysr@777 | 4 | * |
ysr@777 | 5 | * This code is free software; you can redistribute it and/or modify it |
ysr@777 | 6 | * under the terms of the GNU General Public License version 2 only, as |
ysr@777 | 7 | * published by the Free Software Foundation. |
ysr@777 | 8 | * |
ysr@777 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
ysr@777 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ysr@777 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ysr@777 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
ysr@777 | 13 | * accompanied this code). |
ysr@777 | 14 | * |
ysr@777 | 15 | * You should have received a copy of the GNU General Public License version |
ysr@777 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
ysr@777 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ysr@777 | 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. |
ysr@777 | 22 | * |
ysr@777 | 23 | */ |
ysr@777 | 24 | |
stefank@2314 | 25 | #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP |
stefank@2314 | 26 | #define SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP |
stefank@2314 | 27 | |
stefank@2314 | 28 | #include "gc_implementation/g1/g1BlockOffsetTable.hpp" |
mgerdin@6990 | 29 | #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" |
mgerdin@6990 | 30 | #include "gc_implementation/g1/heapRegion.inline.hpp" |
stefank@2314 | 31 | #include "memory/space.hpp" |
stefank@2314 | 32 | |
ysr@777 | 33 | inline HeapWord* G1BlockOffsetTable::block_start(const void* addr) { |
ysr@777 | 34 | if (addr >= _bottom && addr < _end) { |
ysr@777 | 35 | return block_start_unsafe(addr); |
ysr@777 | 36 | } else { |
ysr@777 | 37 | return NULL; |
ysr@777 | 38 | } |
ysr@777 | 39 | } |
ysr@777 | 40 | |
ysr@777 | 41 | inline HeapWord* |
ysr@777 | 42 | G1BlockOffsetTable::block_start_const(const void* addr) const { |
ysr@777 | 43 | if (addr >= _bottom && addr < _end) { |
ysr@777 | 44 | return block_start_unsafe_const(addr); |
ysr@777 | 45 | } else { |
ysr@777 | 46 | return NULL; |
ysr@777 | 47 | } |
ysr@777 | 48 | } |
ysr@777 | 49 | |
ysr@777 | 50 | inline size_t G1BlockOffsetSharedArray::index_for(const void* p) const { |
ysr@777 | 51 | char* pc = (char*)p; |
ysr@777 | 52 | assert(pc >= (char*)_reserved.start() && |
ysr@777 | 53 | pc < (char*)_reserved.end(), |
johnc@4300 | 54 | err_msg("p (" PTR_FORMAT ") not in reserved [" PTR_FORMAT ", " PTR_FORMAT ")", |
drchase@6680 | 55 | p2i(p), p2i(_reserved.start()), p2i(_reserved.end()))); |
ysr@777 | 56 | size_t delta = pointer_delta(pc, _reserved.start(), sizeof(char)); |
ysr@777 | 57 | size_t result = delta >> LogN; |
johnc@4300 | 58 | check_index(result, "bad index from address"); |
ysr@777 | 59 | return result; |
ysr@777 | 60 | } |
ysr@777 | 61 | |
ysr@777 | 62 | inline HeapWord* |
ysr@777 | 63 | G1BlockOffsetSharedArray::address_for_index(size_t index) const { |
johnc@4300 | 64 | check_index(index, "index out of range"); |
ysr@777 | 65 | HeapWord* result = _reserved.start() + (index << LogN_words); |
ysr@777 | 66 | assert(result >= _reserved.start() && result < _reserved.end(), |
coleenp@4037 | 67 | err_msg("bad address from index result " PTR_FORMAT |
coleenp@4037 | 68 | " _reserved.start() " PTR_FORMAT " _reserved.end() " |
coleenp@4037 | 69 | PTR_FORMAT, |
drchase@6680 | 70 | p2i(result), p2i(_reserved.start()), p2i(_reserved.end()))); |
ysr@777 | 71 | return result; |
ysr@777 | 72 | } |
ysr@777 | 73 | |
mgerdin@6987 | 74 | inline size_t |
mgerdin@6987 | 75 | G1BlockOffsetArray::block_size(const HeapWord* p) const { |
mgerdin@6987 | 76 | return gsp()->block_size(p); |
mgerdin@6987 | 77 | } |
mgerdin@6987 | 78 | |
ysr@777 | 79 | inline HeapWord* |
ysr@777 | 80 | G1BlockOffsetArray::block_at_or_preceding(const void* addr, |
ysr@777 | 81 | bool has_max_index, |
ysr@777 | 82 | size_t max_index) const { |
ysr@777 | 83 | assert(_array->offset_array(0) == 0, "objects can't cross covered areas"); |
ysr@777 | 84 | size_t index = _array->index_for(addr); |
ysr@777 | 85 | // We must make sure that the offset table entry we use is valid. If |
ysr@777 | 86 | // "addr" is past the end, start at the last known one and go forward. |
ysr@777 | 87 | if (has_max_index) { |
ysr@777 | 88 | index = MIN2(index, max_index); |
ysr@777 | 89 | } |
ysr@777 | 90 | HeapWord* q = _array->address_for_index(index); |
ysr@777 | 91 | |
ysr@777 | 92 | uint offset = _array->offset_array(index); // Extend u_char to uint. |
ysr@777 | 93 | while (offset >= N_words) { |
ysr@777 | 94 | // The excess of the offset from N_words indicates a power of Base |
ysr@777 | 95 | // to go back by. |
ysr@777 | 96 | size_t n_cards_back = BlockOffsetArray::entry_to_cards_back(offset); |
ysr@777 | 97 | q -= (N_words * n_cards_back); |
mgerdin@6987 | 98 | assert(q >= gsp()->bottom(), "Went below bottom!"); |
ysr@777 | 99 | index -= n_cards_back; |
ysr@777 | 100 | offset = _array->offset_array(index); |
ysr@777 | 101 | } |
ysr@777 | 102 | assert(offset < N_words, "offset too large"); |
ysr@777 | 103 | q -= offset; |
ysr@777 | 104 | return q; |
ysr@777 | 105 | } |
ysr@777 | 106 | |
ysr@777 | 107 | inline HeapWord* |
ysr@777 | 108 | G1BlockOffsetArray:: |
ysr@777 | 109 | forward_to_block_containing_addr_const(HeapWord* q, HeapWord* n, |
ysr@777 | 110 | const void* addr) const { |
mgerdin@6987 | 111 | if (addr >= gsp()->top()) return gsp()->top(); |
mgerdin@6987 | 112 | while (n <= addr) { |
mgerdin@6987 | 113 | q = n; |
mgerdin@6987 | 114 | oop obj = oop(q); |
mgerdin@6987 | 115 | if (obj->klass_or_null() == NULL) return q; |
stefank@6992 | 116 | n += block_size(q); |
ysr@777 | 117 | } |
ysr@777 | 118 | assert(q <= n, "wrong order for q and addr"); |
ysr@777 | 119 | assert(addr < n, "wrong order for addr and n"); |
ysr@777 | 120 | return q; |
ysr@777 | 121 | } |
ysr@777 | 122 | |
ysr@777 | 123 | inline HeapWord* |
ysr@777 | 124 | G1BlockOffsetArray::forward_to_block_containing_addr(HeapWord* q, |
ysr@777 | 125 | const void* addr) { |
ysr@1280 | 126 | if (oop(q)->klass_or_null() == NULL) return q; |
mgerdin@6987 | 127 | HeapWord* n = q + block_size(q); |
ysr@777 | 128 | // In the normal case, where the query "addr" is a card boundary, and the |
ysr@777 | 129 | // offset table chunks are the same size as cards, the block starting at |
ysr@777 | 130 | // "q" will contain addr, so the test below will fail, and we'll fall |
ysr@777 | 131 | // through quickly. |
ysr@777 | 132 | if (n <= addr) { |
ysr@777 | 133 | q = forward_to_block_containing_addr_slow(q, n, addr); |
ysr@777 | 134 | } |
ysr@777 | 135 | assert(q <= addr, "wrong order for current and arg"); |
ysr@777 | 136 | return q; |
ysr@777 | 137 | } |
ysr@777 | 138 | |
ysr@777 | 139 | ////////////////////////////////////////////////////////////////////////// |
ysr@777 | 140 | // BlockOffsetArrayNonContigSpace inlines |
ysr@777 | 141 | ////////////////////////////////////////////////////////////////////////// |
ysr@777 | 142 | inline void G1BlockOffsetArray::freed(HeapWord* blk_start, HeapWord* blk_end) { |
ysr@777 | 143 | // Verify that the BOT shows [blk_start, blk_end) to be one block. |
ysr@777 | 144 | verify_single_block(blk_start, blk_end); |
ysr@777 | 145 | // adjust _unallocated_block upward or downward |
ysr@777 | 146 | // as appropriate |
ysr@777 | 147 | if (BlockOffsetArrayUseUnallocatedBlock) { |
ysr@777 | 148 | assert(_unallocated_block <= _end, |
ysr@777 | 149 | "Inconsistent value for _unallocated_block"); |
ysr@777 | 150 | if (blk_end >= _unallocated_block && blk_start <= _unallocated_block) { |
ysr@777 | 151 | // CMS-specific note: a block abutting _unallocated_block to |
ysr@777 | 152 | // its left is being freed, a new block is being added or |
ysr@777 | 153 | // we are resetting following a compaction |
ysr@777 | 154 | _unallocated_block = blk_start; |
ysr@777 | 155 | } |
ysr@777 | 156 | } |
ysr@777 | 157 | } |
ysr@777 | 158 | |
ysr@777 | 159 | inline void G1BlockOffsetArray::freed(HeapWord* blk, size_t size) { |
ysr@777 | 160 | freed(blk, blk + size); |
ysr@777 | 161 | } |
stefank@2314 | 162 | |
stefank@2314 | 163 | #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_INLINE_HPP |