src/hotspot/share/gc/parallel/psOldGen.cpp

rev 57719 : imported patch 8235860-remove-serial-old-gc
rev 57721 : [mq]: 8235860-lkorinth-review

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2019, 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, 2020, 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.
*** 27,63 ****
  #include "gc/parallel/parallelArguments.hpp"
  #include "gc/parallel/parallelScavengeHeap.hpp"
  #include "gc/parallel/psAdaptiveSizePolicy.hpp"
  #include "gc/parallel/psCardTable.hpp"
  #include "gc/parallel/psFileBackedVirtualspace.hpp"
- #include "gc/parallel/psMarkSweepDecorator.hpp"
  #include "gc/parallel/psOldGen.hpp"
  #include "gc/shared/cardTableBarrierSet.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "gc/shared/spaceDecorator.inline.hpp"
  #include "logging/log.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/java.hpp"
  #include "utilities/align.hpp"
  
- inline const char* PSOldGen::select_name() {
-   return UseParallelOldGC ? "ParOldGen" : "PSOldGen";
- }
- 
  PSOldGen::PSOldGen(ReservedSpace rs, size_t alignment,
                     size_t initial_size, size_t min_size, size_t max_size,
                     const char* perf_data_name, int level):
!   _name(select_name()), _init_gen_size(initial_size), _min_gen_size(min_size),
    _max_gen_size(max_size)
  {
    initialize(rs, alignment, perf_data_name, level);
  }
  
  PSOldGen::PSOldGen(size_t initial_size,
                     size_t min_size, size_t max_size,
                     const char* perf_data_name, int level):
!   _name(select_name()), _init_gen_size(initial_size), _min_gen_size(min_size),
    _max_gen_size(max_size)
  {}
  
  void PSOldGen::initialize(ReservedSpace rs, size_t alignment,
                            const char* perf_data_name, int level) {
--- 27,58 ----
  #include "gc/parallel/parallelArguments.hpp"
  #include "gc/parallel/parallelScavengeHeap.hpp"
  #include "gc/parallel/psAdaptiveSizePolicy.hpp"
  #include "gc/parallel/psCardTable.hpp"
  #include "gc/parallel/psFileBackedVirtualspace.hpp"
  #include "gc/parallel/psOldGen.hpp"
  #include "gc/shared/cardTableBarrierSet.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "gc/shared/spaceDecorator.inline.hpp"
  #include "logging/log.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/java.hpp"
  #include "utilities/align.hpp"
  
  PSOldGen::PSOldGen(ReservedSpace rs, size_t alignment,
                     size_t initial_size, size_t min_size, size_t max_size,
                     const char* perf_data_name, int level):
!   _init_gen_size(initial_size), _min_gen_size(min_size),
    _max_gen_size(max_size)
  {
    initialize(rs, alignment, perf_data_name, level);
  }
  
  PSOldGen::PSOldGen(size_t initial_size,
                     size_t min_size, size_t max_size,
                     const char* perf_data_name, int level):
!   _init_gen_size(initial_size), _min_gen_size(min_size),
    _max_gen_size(max_size)
  {}
  
  void PSOldGen::initialize(ReservedSpace rs, size_t alignment,
                            const char* perf_data_name, int level) {
*** 146,163 ****
  
    object_space()->initialize(cmr,
                               SpaceDecorator::Clear,
                               SpaceDecorator::Mangle);
  
- #if INCLUDE_SERIALGC
-   _object_mark_sweep = new PSMarkSweepDecorator(_object_space, start_array(), MarkSweepDeadRatio);
- 
-   if (_object_mark_sweep == NULL) {
-     vm_exit_during_initialization("Could not complete allocation of old generation");
-   }
- #endif // INCLUDE_SERIALGC
- 
    // Update the start_array
    start_array()->set_covered_region(cmr);
  }
  
  void PSOldGen::initialize_performance_counters(const char* perf_data_name, int level) {
--- 141,150 ----
*** 173,206 ****
  // reserved size is not 0.
  bool  PSOldGen::is_allocated() {
    return virtual_space()->reserved_size() != 0;
  }
  
- #if INCLUDE_SERIALGC
- 
- void PSOldGen::precompact() {
-   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
- 
-   // Reset start array first.
-   start_array()->reset();
- 
-   object_mark_sweep()->precompact();
- 
-   // Now compact the young gen
-   heap->young_gen()->precompact();
- }
- 
- void PSOldGen::adjust_pointers() {
-   object_mark_sweep()->adjust_pointers();
- }
- 
- void PSOldGen::compact() {
-   object_mark_sweep()->compact(ZapUnusedHeapArea);
- }
- 
- #endif // INCLUDE_SERIALGC
- 
  size_t PSOldGen::contiguous_available() const {
    return object_space()->free_in_bytes() + virtual_space()->uncommitted_size();
  }
  
  // Allocation. We report all successful allocations to the size policy
--- 160,169 ----