1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp Wed Jun 15 10:18:04 2011 -0700
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp Thu Jun 16 15:51:57 2011 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -165,12 +165,13 @@
1.11 // an excessive amount of time is being spent doing collections
1.12 // and caused a NULL to be returned. If a NULL is not returned,
1.13 // "gc_time_limit_was_exceeded" has an undefined meaning.
1.14 + HeapWord* mem_allocate(size_t size,
1.15 + bool* gc_overhead_limit_was_exceeded);
1.16
1.17 - HeapWord* mem_allocate(size_t size,
1.18 - bool is_noref,
1.19 - bool is_tlab,
1.20 - bool* gc_overhead_limit_was_exceeded);
1.21 - HeapWord* failed_mem_allocate(size_t size, bool is_tlab);
1.22 + // Allocation attempt(s) during a safepoint. It should never be called
1.23 + // to allocate a new TLAB as this allocation might be satisfied out
1.24 + // of the old generation.
1.25 + HeapWord* failed_mem_allocate(size_t size);
1.26
1.27 HeapWord* permanent_mem_allocate(size_t size);
1.28 HeapWord* failed_permanent_mem_allocate(size_t size);
1.29 @@ -194,8 +195,6 @@
1.30 inline void invoke_scavenge();
1.31 inline void invoke_full_gc(bool maximum_compaction);
1.32
1.33 - size_t large_typearray_limit() { return FastAllocateSizeLimit; }
1.34 -
1.35 bool supports_inline_contig_alloc() const { return !UseNUMA; }
1.36
1.37 HeapWord** top_addr() const { return !UseNUMA ? young_gen()->top_addr() : (HeapWord**)-1; }
