src/share/vm/gc/g1/g1Allocator.hpp

rev 8869 : imported patch tom-review

*** 55,68 ****
    // Accessors to the allocation regions.
    virtual SurvivorGCAllocRegion* survivor_gc_alloc_region(AllocationContext_t context) = 0;
    virtual OldGCAllocRegion* old_gc_alloc_region(AllocationContext_t context) = 0;
  
    // Allocation attempt during GC for a survivor object / PLAB.
!   inline HeapWord* survivor_attempt_allocation(size_t word_size,
                                                 AllocationContext_t context);
    // Allocation attempt during GC for an old object / PLAB.
!   inline HeapWord* old_attempt_allocation(size_t word_size,
                                            AllocationContext_t context);
  public:
    G1Allocator(G1CollectedHeap* heap) : _g1h(heap), _survivor_is_full(false), _old_is_full(false) { }
    virtual ~G1Allocator() { }
  
--- 55,72 ----
    // Accessors to the allocation regions.
    virtual SurvivorGCAllocRegion* survivor_gc_alloc_region(AllocationContext_t context) = 0;
    virtual OldGCAllocRegion* old_gc_alloc_region(AllocationContext_t context) = 0;
  
    // Allocation attempt during GC for a survivor object / PLAB.
!   inline HeapWord* survivor_attempt_allocation(size_t min_word_size,
!                                                size_t desired_word_size,
!                                                size_t* actual_word_size,
                                                 AllocationContext_t context);
    // Allocation attempt during GC for an old object / PLAB.
!   inline HeapWord* old_attempt_allocation(size_t min_word_size,
!                                           size_t desired_word_size,
!                                           size_t* actual_word_size,
                                            AllocationContext_t context);
  public:
    G1Allocator(G1CollectedHeap* heap) : _g1h(heap), _survivor_is_full(false), _old_is_full(false) { }
    virtual ~G1Allocator() { }
  
*** 100,109 ****
--- 104,119 ----
    // may not be a humongous - it must fit into a single heap region.
    HeapWord* par_allocate_during_gc(InCSetState dest,
                                     size_t word_size,
                                     AllocationContext_t context);
  
+   HeapWord* par_allocate_during_gc(InCSetState dest,
+                                    size_t min_word_size,
+                                    size_t desired_word_size,
+                                    size_t* actual_word_size,
+                                    AllocationContext_t context);
+ 
    virtual size_t used_in_alloc_regions() = 0;
  };
  
  // The default allocation region manager for G1. Provides a single mutator, survivor
  // and old generation allocation region.