src/share/vm/memory/collectorPolicy.cpp

rev 7780 : imported patch 8072621

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 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) 2001, 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.
*** 595,605 ****
    *gc_overhead_limit_was_exceeded = false;
  
    HeapWord* result = NULL;
  
    // Loop until the allocation is satisfied, or unsatisfied after GC.
!   for (int try_count = 1, gclocker_stalled_count = 0; /* return or throw */; try_count += 1) {
      HandleMark hm; // Discard any handles allocated in each iteration.
  
      // First allocation attempt is lock-free.
      Generation *young = gch->get_gen(0);
      assert(young->supports_inline_contig_alloc(),
--- 595,605 ----
    *gc_overhead_limit_was_exceeded = false;
  
    HeapWord* result = NULL;
  
    // Loop until the allocation is satisfied, or unsatisfied after GC.
!   for (uint try_count = 1, gclocker_stalled_count = 0; /* return or throw */; try_count += 1) {
      HandleMark hm; // Discard any handles allocated in each iteration.
  
      // First allocation attempt is lock-free.
      Generation *young = gch->get_gen(0);
      assert(young->supports_inline_contig_alloc(),
*** 609,619 ****
        if (result != NULL) {
          assert(gch->is_in_reserved(result), "result not in heap");
          return result;
        }
      }
!     unsigned int gc_count_before;  // Read inside the Heap_lock locked region.
      {
        MutexLocker ml(Heap_lock);
        if (PrintGC && Verbose) {
          gclog_or_tty->print_cr("TwoGenerationCollectorPolicy::mem_allocate_work:"
                        " attempting locked slow path allocation");
--- 609,619 ----
        if (result != NULL) {
          assert(gch->is_in_reserved(result), "result not in heap");
          return result;
        }
      }
!     uint gc_count_before;  // Read inside the Heap_lock locked region.
      {
        MutexLocker ml(Heap_lock);
        if (PrintGC && Verbose) {
          gclog_or_tty->print_cr("TwoGenerationCollectorPolicy::mem_allocate_work:"
                        " attempting locked slow path allocation");