src/hotspot/share/gc/serial/defNewGeneration.cpp

rev 49911 : imported patch removeAllGCs

*** 54,64 ****
  #include "runtime/thread.inline.hpp"
  #include "utilities/align.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/globalDefinitions.hpp"
  #include "utilities/stack.inline.hpp"
! #if INCLUDE_ALL_GCS
  #include "gc/cms/parOopClosures.hpp"
  #endif
  
  //
  // DefNewGeneration functions.
--- 54,64 ----
  #include "runtime/thread.inline.hpp"
  #include "utilities/align.hpp"
  #include "utilities/copy.hpp"
  #include "utilities/globalDefinitions.hpp"
  #include "utilities/stack.inline.hpp"
! #if INCLUDE_CMSGC
  #include "gc/cms/parOopClosures.hpp"
  #endif
  
  //
  // DefNewGeneration functions.
*** 1004,1014 ****
    // We try to allocate from the eden.  If that works, we are happy.
    // Note that since DefNewGeneration supports lock-free allocation, we
    // have to use it here, as well.
    HeapWord* result = eden()->par_allocate(word_size);
    if (result != NULL) {
! #if INCLUDE_ALL_GCS
      if (CMSEdenChunksRecordAlways && _old_gen != NULL) {
        _old_gen->sample_eden_chunk();
      }
  #endif
    } else {
--- 1004,1014 ----
    // We try to allocate from the eden.  If that works, we are happy.
    // Note that since DefNewGeneration supports lock-free allocation, we
    // have to use it here, as well.
    HeapWord* result = eden()->par_allocate(word_size);
    if (result != NULL) {
! #if INCLUDE_CMSGC
      if (CMSEdenChunksRecordAlways && _old_gen != NULL) {
        _old_gen->sample_eden_chunk();
      }
  #endif
    } else {
*** 1022,1032 ****
  }
  
  HeapWord* DefNewGeneration::par_allocate(size_t word_size,
                                           bool is_tlab) {
    HeapWord* res = eden()->par_allocate(word_size);
! #if INCLUDE_ALL_GCS
    if (CMSEdenChunksRecordAlways && _old_gen != NULL) {
      _old_gen->sample_eden_chunk();
    }
  #endif
    return res;
--- 1022,1032 ----
  }
  
  HeapWord* DefNewGeneration::par_allocate(size_t word_size,
                                           bool is_tlab) {
    HeapWord* res = eden()->par_allocate(word_size);
! #if INCLUDE_CMSGC
    if (CMSEdenChunksRecordAlways && _old_gen != NULL) {
      _old_gen->sample_eden_chunk();
    }
  #endif
    return res;