Thu, 16 Jun 2011 15:51:57 -0400
6994322: Remove the is_tlab and is_noref / is_large_noref parameters from the CollectedHeap
Summary: Remove two unused parameters from the mem_allocate() method and update its uses accordingly.
Reviewed-by: stefank, johnc
duke@435 | 1 | /* |
stefank@2314 | 2 | * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 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. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
stefank@2314 | 25 | #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP |
stefank@2314 | 26 | #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP |
stefank@2314 | 27 | |
stefank@2314 | 28 | #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" |
stefank@2314 | 29 | #include "gc_implementation/parallelScavenge/psMarkSweep.hpp" |
stefank@2314 | 30 | #include "gc_implementation/parallelScavenge/psParallelCompact.hpp" |
stefank@2314 | 31 | #include "gc_implementation/parallelScavenge/psScavenge.hpp" |
stefank@2314 | 32 | |
duke@435 | 33 | inline size_t ParallelScavengeHeap::total_invocations() |
duke@435 | 34 | { |
duke@435 | 35 | return UseParallelOldGC ? PSParallelCompact::total_invocations() : |
duke@435 | 36 | PSMarkSweep::total_invocations(); |
duke@435 | 37 | } |
duke@435 | 38 | |
duke@435 | 39 | inline void ParallelScavengeHeap::invoke_scavenge() |
duke@435 | 40 | { |
duke@435 | 41 | PSScavenge::invoke(); |
duke@435 | 42 | } |
duke@435 | 43 | |
duke@435 | 44 | inline void ParallelScavengeHeap::invoke_full_gc(bool maximum_compaction) |
duke@435 | 45 | { |
duke@435 | 46 | if (UseParallelOldGC) { |
duke@435 | 47 | PSParallelCompact::invoke(maximum_compaction); |
duke@435 | 48 | } else { |
duke@435 | 49 | PSMarkSweep::invoke(maximum_compaction); |
duke@435 | 50 | } |
duke@435 | 51 | } |
ysr@1462 | 52 | |
ysr@1462 | 53 | inline bool ParallelScavengeHeap::is_in_young(oop p) { |
jmasa@2909 | 54 | // Assumes the the old gen address range is lower than that of the young gen. |
jmasa@2909 | 55 | const void* loc = (void*) p; |
jmasa@2909 | 56 | bool result = ((HeapWord*)p) >= young_gen()->reserved().start(); |
jmasa@2909 | 57 | assert(result == young_gen()->is_in_reserved(p), |
jmasa@2909 | 58 | err_msg("incorrect test - result=%d, p=" PTR_FORMAT, result, (void*)p)); |
jmasa@2909 | 59 | return result; |
ysr@1462 | 60 | } |
ysr@1462 | 61 | |
ysr@1462 | 62 | inline bool ParallelScavengeHeap::is_in_old_or_perm(oop p) { |
ysr@1462 | 63 | return old_gen()->is_in_reserved(p) || perm_gen()->is_in_reserved(p); |
ysr@1462 | 64 | } |
stefank@2314 | 65 | |
stefank@2314 | 66 | #endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARALLELSCAVENGEHEAP_INLINE_HPP |