comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @ 8883:b9a918201d47

Merge with hsx25
author Gilles Duboscq <duboscq@ssw.jku.at>
date Sat, 06 Apr 2013 20:04:06 +0200
parents c3657d00e343 2e093b564241
children 89e4d67fdd2a
comparison
equal deleted inserted replaced
8660:d47b52b0ff68 8883:b9a918201d47
557 557
558 // First-level mutator allocation attempt: try to allocate out of 558 // First-level mutator allocation attempt: try to allocate out of
559 // the mutator alloc region without taking the Heap_lock. This 559 // the mutator alloc region without taking the Heap_lock. This
560 // should only be used for non-humongous allocations. 560 // should only be used for non-humongous allocations.
561 inline HeapWord* attempt_allocation(size_t word_size, 561 inline HeapWord* attempt_allocation(size_t word_size,
562 unsigned int* gc_count_before_ret); 562 unsigned int* gc_count_before_ret,
563 int* gclocker_retry_count_ret);
563 564
564 // Second-level mutator allocation attempt: take the Heap_lock and 565 // Second-level mutator allocation attempt: take the Heap_lock and
565 // retry the allocation attempt, potentially scheduling a GC 566 // retry the allocation attempt, potentially scheduling a GC
566 // pause. This should only be used for non-humongous allocations. 567 // pause. This should only be used for non-humongous allocations.
567 HeapWord* attempt_allocation_slow(size_t word_size, 568 HeapWord* attempt_allocation_slow(size_t word_size,
568 unsigned int* gc_count_before_ret); 569 unsigned int* gc_count_before_ret,
570 int* gclocker_retry_count_ret);
569 571
570 // Takes the Heap_lock and attempts a humongous allocation. It can 572 // Takes the Heap_lock and attempts a humongous allocation. It can
571 // potentially schedule a GC pause. 573 // potentially schedule a GC pause.
572 HeapWord* attempt_allocation_humongous(size_t word_size, 574 HeapWord* attempt_allocation_humongous(size_t word_size,
573 unsigned int* gc_count_before_ret); 575 unsigned int* gc_count_before_ret,
576 int* gclocker_retry_count_ret);
574 577
575 // Allocation attempt that should be called during safepoints (e.g., 578 // Allocation attempt that should be called during safepoints (e.g.,
576 // at the end of a successful GC). expect_null_mutator_alloc_region 579 // at the end of a successful GC). expect_null_mutator_alloc_region
577 // specifies whether the mutator alloc region is expected to be NULL 580 // specifies whether the mutator alloc region is expected to be NULL
578 // or not. 581 // or not.