src/share/vm/gc_implementation/g1/g1Allocator.cpp

rev 7799 : imported patch 8073466-remove-ratining-functionality-in-pargcallocbuffer

*** 1,7 ****
  /*
!  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 118,128 ****
                                                          AllocationContext_t context) {
    size_t gclab_word_size = _g1h->desired_plab_sz(dest);
    if (word_sz * 100 < gclab_word_size * ParallelGCBufferWastePct) {
      G1ParGCAllocBuffer* alloc_buf = alloc_buffer(dest, context);
      add_to_alloc_buffer_waste(alloc_buf->words_remaining());
!     alloc_buf->retire(false /* end_of_gc */, false /* retain */);
  
      HeapWord* buf = _g1h->par_allocate_during_gc(dest, gclab_word_size, context);
      if (buf == NULL) {
        return NULL; // Let caller handle allocation failure.
      }
--- 118,128 ----
                                                          AllocationContext_t context) {
    size_t gclab_word_size = _g1h->desired_plab_sz(dest);
    if (word_sz * 100 < gclab_word_size * ParallelGCBufferWastePct) {
      G1ParGCAllocBuffer* alloc_buf = alloc_buffer(dest, context);
      add_to_alloc_buffer_waste(alloc_buf->words_remaining());
!     alloc_buf->retire();
  
      HeapWord* buf = _g1h->par_allocate_during_gc(dest, gclab_word_size, context);
      if (buf == NULL) {
        return NULL; // Let caller handle allocation failure.
      }
*** 152,162 ****
  void G1DefaultParGCAllocator::retire_alloc_buffers() {
    for (uint state = 0; state < InCSetState::Num; state++) {
      G1ParGCAllocBuffer* const buf = _alloc_buffers[state];
      if (buf != NULL) {
        add_to_alloc_buffer_waste(buf->words_remaining());
!       buf->flush_stats_and_retire(_g1h->alloc_buffer_stats(state),
!                                   true /* end_of_gc */,
!                                   false /* retain */);
      }
    }
  }
--- 152,160 ----
  void G1DefaultParGCAllocator::retire_alloc_buffers() {
    for (uint state = 0; state < InCSetState::Num; state++) {
      G1ParGCAllocBuffer* const buf = _alloc_buffers[state];
      if (buf != NULL) {
        add_to_alloc_buffer_waste(buf->words_remaining());
!       buf->flush_and_retire_stats(_g1h->alloc_buffer_stats(state));
      }
    }
  }