src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp

*** 1,28 ****
  /*
! * Copyright (c) 2018, 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.
! *
! * This code is distributed in the hope that it will be useful, but WITHOUT
! * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
! * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
! * version 2 for more details (a copy is included in the LICENSE file that
! * accompanied this code).
! *
! * You should have received a copy of the GNU General Public License version
! * 2 along with this work; if not, write to the Free Software Foundation,
! * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
! *
! * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
! * or visit www.oracle.com if you need additional information or have any
! * questions.
! *
! */
  
  #ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
  #define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
  
  #include "gc/parallel/adjoiningGenerations.hpp"
--- 1,28 ----
  /*
!  * Copyright (c) 2018, 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.
!  *
!  * This code is distributed in the hope that it will be useful, but WITHOUT
!  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
!  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
!  * version 2 for more details (a copy is included in the LICENSE file that
!  * accompanied this code).
!  *
!  * You should have received a copy of the GNU General Public License version
!  * 2 along with this work; if not, write to the Free Software Foundation,
!  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
!  *
!  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
!  * or visit www.oracle.com if you need additional information or have any
!  * questions.
!  *
!  */
  
  #ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
  #define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
  
  #include "gc/parallel/adjoiningGenerations.hpp"
*** 32,42 ****
  private:
    // Maximum total size of the generations. This is equal to the heap size specified by user.
    // When adjusting young and old generation sizes, we need ensure that sum of the generation sizes does not exceed this.
    size_t _total_size_limit;
  
!   size_t total_size_limit() {
      return _total_size_limit;
    }
  
    // HeteroVirtualSpaces creates non-overlapping virtual spaces.
    // low() manages memory in nv-dimm and is meant for old generation.
--- 32,42 ----
  private:
    // Maximum total size of the generations. This is equal to the heap size specified by user.
    // When adjusting young and old generation sizes, we need ensure that sum of the generation sizes does not exceed this.
    size_t _total_size_limit;
  
!   size_t total_size_limit() const {
      return _total_size_limit;
    }
  
    // HeteroVirtualSpaces creates non-overlapping virtual spaces.
    // low() manages memory in nv-dimm and is meant for old generation.
*** 44,55 ****
    class HeteroVirtualSpaces : public AdjoiningVirtualSpaces {
      PSVirtualSpace*    _young_vs;
      PSVirtualSpace*    _old_vs;
  
      size_t _min_old_byte_size;
-     size_t _max_old_byte_size;
      size_t _min_young_byte_size;
      size_t _max_young_byte_size;
      size_t _max_total_size;
  
    public:
      HeteroVirtualSpaces(ReservedSpace rs,
--- 44,55 ----
    class HeteroVirtualSpaces : public AdjoiningVirtualSpaces {
      PSVirtualSpace*    _young_vs;
      PSVirtualSpace*    _old_vs;
  
      size_t _min_old_byte_size;
      size_t _min_young_byte_size;
+     size_t _max_old_byte_size;
      size_t _max_young_byte_size;
      size_t _max_total_size;
  
    public:
      HeteroVirtualSpaces(ReservedSpace rs,
*** 62,73 ****
      // Increase old generation size and decrease young generation size by same amount
      bool adjust_boundary_up(size_t size_in_bytes);
      // Increase young generation size and decrease old generation size by same amount
      bool adjust_boundary_down(size_t size_in_bytes);
  
!     size_t max_young_size() { return _max_young_byte_size; }
!     size_t max_old_size() { return _max_old_byte_size; }
  
      void initialize(size_t initial_old_reserved_size, size_t init_low_byte_size,
        size_t init_high_byte_size);
    };
  
--- 62,73 ----
      // Increase old generation size and decrease young generation size by same amount
      bool adjust_boundary_up(size_t size_in_bytes);
      // Increase young generation size and decrease old generation size by same amount
      bool adjust_boundary_down(size_t size_in_bytes);
  
!     size_t max_young_size() const { return _max_young_byte_size; }
!     size_t max_old_size() const { return _max_old_byte_size; }
  
      void initialize(size_t initial_old_reserved_size, size_t init_low_byte_size,
                      size_t init_high_byte_size);
    };
  
*** 80,84 ****
--- 80,85 ----
  
    // Return the total byte size of the reserved space
    size_t reserved_byte_size();
  };
  #endif // SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
+