src/share/vm/gc/g1/g1AllocRegion.inline.hpp

rev 8868 : imported patch 8067336-allow-that-plab-allocations-at-end-of-regions-are-flexible
rev 8869 : [mq]: refactor-desired-actual-size
rev 8870 : [mq]: tom-review

*** 74,87 ****
    HeapRegion* alloc_region = _alloc_region;
    assert(alloc_region != NULL, ar_ext_msg(this, "not initialized properly"));
  
    HeapWord* result = par_allocate(alloc_region, min_word_size, desired_word_size, actual_word_size, bot_updates);
    if (result != NULL) {
!     trace("alloc", *actual_word_size, result);
      return result;
    }
!   trace("alloc failed", *actual_word_size);
    return NULL;
  }
  
  inline HeapWord* G1AllocRegion::attempt_allocation_locked(size_t word_size, bool bot_updates) {
    size_t temp;
--- 74,87 ----
    HeapRegion* alloc_region = _alloc_region;
    assert(alloc_region != NULL, ar_ext_msg(this, "not initialized properly"));
  
    HeapWord* result = par_allocate(alloc_region, min_word_size, desired_word_size, actual_word_size, bot_updates);
    if (result != NULL) {
!     trace("alloc", min_word_size, desired_word_size, *actual_word_size, result);
      return result;
    }
!   trace("alloc failed", min_word_size, desired_word_size);
    return NULL;
  }
  
  inline HeapWord* G1AllocRegion::attempt_allocation_locked(size_t word_size, bool bot_updates) {
    size_t temp;
*** 101,128 ****
    }
  
    retire(true /* fill_up */);
    result = new_alloc_region_and_allocate(desired_word_size, false /* force */);
    if (result != NULL) {
!     trace("alloc locked (second attempt)", *actual_word_size, result);
      return result;
    }
!   trace("alloc locked failed", *actual_word_size);
    return NULL;
  }
  
  inline HeapWord* G1AllocRegion::attempt_allocation_force(size_t word_size,
                                                           bool bot_updates) {
    assert(bot_updates == _bot_updates, ar_ext_msg(this, "pre-condition"));
    assert(_alloc_region != NULL, ar_ext_msg(this, "not initialized properly"));
  
!   trace("forcing alloc");
    HeapWord* result = new_alloc_region_and_allocate(word_size, true /* force */);
    if (result != NULL) {
!     trace("alloc forced", word_size, result);
      return result;
    }
!   trace("alloc forced failed", word_size);
    return NULL;
  }
  
  #endif // SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
--- 101,129 ----
    }
  
    retire(true /* fill_up */);
    result = new_alloc_region_and_allocate(desired_word_size, false /* force */);
    if (result != NULL) {
!     *actual_word_size = desired_word_size;
!     trace("alloc locked (second attempt)", min_word_size, desired_word_size, *actual_word_size, result);
      return result;
    }
!   trace("alloc locked failed", min_word_size, desired_word_size);
    return NULL;
  }
  
  inline HeapWord* G1AllocRegion::attempt_allocation_force(size_t word_size,
                                                           bool bot_updates) {
    assert(bot_updates == _bot_updates, ar_ext_msg(this, "pre-condition"));
    assert(_alloc_region != NULL, ar_ext_msg(this, "not initialized properly"));
  
!   trace("forcing alloc", word_size, word_size);
    HeapWord* result = new_alloc_region_and_allocate(word_size, true /* force */);
    if (result != NULL) {
!     trace("alloc forced", word_size, word_size, word_size, result);
      return result;
    }
!   trace("alloc forced failed", word_size, word_size);
    return NULL;
  }
  
  #endif // SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP