1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Wed Mar 27 10:55:37 2013 +0100
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Mar 28 10:27:28 2013 +0100
1.3 @@ -559,18 +559,21 @@
1.4 // the mutator alloc region without taking the Heap_lock. This
1.5 // should only be used for non-humongous allocations.
1.6 inline HeapWord* attempt_allocation(size_t word_size,
1.7 - unsigned int* gc_count_before_ret);
1.8 + unsigned int* gc_count_before_ret,
1.9 + int* gclocker_retry_count_ret);
1.10
1.11 // Second-level mutator allocation attempt: take the Heap_lock and
1.12 // retry the allocation attempt, potentially scheduling a GC
1.13 // pause. This should only be used for non-humongous allocations.
1.14 HeapWord* attempt_allocation_slow(size_t word_size,
1.15 - unsigned int* gc_count_before_ret);
1.16 + unsigned int* gc_count_before_ret,
1.17 + int* gclocker_retry_count_ret);
1.18
1.19 // Takes the Heap_lock and attempts a humongous allocation. It can
1.20 // potentially schedule a GC pause.
1.21 HeapWord* attempt_allocation_humongous(size_t word_size,
1.22 - unsigned int* gc_count_before_ret);
1.23 + unsigned int* gc_count_before_ret,
1.24 + int* gclocker_retry_count_ret);
1.25
1.26 // Allocation attempt that should be called during safepoints (e.g.,
1.27 // at the end of a successful GC). expect_null_mutator_alloc_region
