src/share/vm/gc/g1/vm_operations_g1.cpp

*** 22,35 ****
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/concurrentMarkThread.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectorPolicy.hpp"
- #include "gc/shared/gcId.hpp"
  #include "gc/g1/vm_operations_g1.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
  #include "runtime/interfaceSupport.hpp"
  
--- 22,37 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/concurrentMarkThread.inline.hpp"
+ #include "gc/g1/g1Allocator.hpp"
+ #include "gc/g1/g1Allocator.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectorPolicy.hpp"
  #include "gc/g1/vm_operations_g1.hpp"
+ #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/isGCActiveMark.hpp"
  #include "runtime/interfaceSupport.hpp"
  
*** 92,102 ****
    assert(!_should_initiate_conc_mark || g1h->should_do_concurrent_full_gc(_gc_cause),
        "only a GC locker, a System.gc(), stats update, whitebox, or a hum allocation induced GC should start a cycle");
  
    if (_word_size > 0) {
      // An allocation has been requested. So, try to do that first.
!     _result = g1h->attempt_allocation_at_safepoint(_word_size,
                                                     allocation_context(),
                                                     false /* expect_null_cur_alloc_region */);
      if (_result != NULL) {
        // If we can successfully allocate before we actually do the
        // pause then we will consider this pause successful.
--- 94,104 ----
    assert(!_should_initiate_conc_mark || g1h->should_do_concurrent_full_gc(_gc_cause),
        "only a GC locker, a System.gc(), stats update, whitebox, or a hum allocation induced GC should start a cycle");
  
    if (_word_size > 0) {
      // An allocation has been requested. So, try to do that first.
!     _result = g1h->allocator()->attempt_allocation_at_safepoint(_word_size,
                                                                  allocation_context(),
                                                                  false /* expect_null_cur_alloc_region */);
      if (_result != NULL) {
        // If we can successfully allocate before we actually do the
        // pause then we will consider this pause successful.
*** 146,156 ****
  
    _pause_succeeded =
      g1h->do_collection_pause_at_safepoint(_target_pause_time_ms);
    if (_pause_succeeded && _word_size > 0) {
      // An allocation had been requested.
!     _result = g1h->attempt_allocation_at_safepoint(_word_size,
                                                     allocation_context(),
                                                     true /* expect_null_cur_alloc_region */);
    } else {
      assert(_result == NULL, "invariant");
      if (!_pause_succeeded) {
--- 148,158 ----
  
    _pause_succeeded =
      g1h->do_collection_pause_at_safepoint(_target_pause_time_ms);
    if (_pause_succeeded && _word_size > 0) {
      // An allocation had been requested.
!     _result = g1h->allocator()->attempt_allocation_at_safepoint(_word_size,
                                                                  allocation_context(),
                                                                  true /* expect_null_cur_alloc_region */);
    } else {
      assert(_result == NULL, "invariant");
      if (!_pause_succeeded) {