src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp

*** 1,7 ***
--- 1,8 ---
  /*
   * Copyright (c) 2013, 2019, Red Hat, Inc. All rights reserved.
+  * Copyright Amazon.com Inc. 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.

*** 23,23 ***
   */
  
  #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
  #define SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
  
- #ifndef SERIALGC
  #include "gc/shenandoah/shenandoahHeap.hpp"
  #include "services/memoryPool.hpp"
  #include "services/memoryUsage.hpp"
- #endif
  
  class ShenandoahMemoryPool : public CollectedMemoryPool {
! private:
     ShenandoahHeap* _heap;
  
  public:
!   ShenandoahMemoryPool(ShenandoahHeap* pool);
!   MemoryUsage get_memory_usage();
!   size_t used_in_bytes()              { return _heap->used(); }
!   size_t max_size() const             { return _heap->max_capacity(); }
  };
  
  #endif // SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
--- 24,48 ---
   */
  
  #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
  #define SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
  
  #include "gc/shenandoah/shenandoahHeap.hpp"
  #include "services/memoryPool.hpp"
  #include "services/memoryUsage.hpp"
  
  class ShenandoahMemoryPool : public CollectedMemoryPool {
! protected:
     ShenandoahHeap* _heap;
  
  public:
!   explicit ShenandoahMemoryPool(ShenandoahHeap* heap,
!                        const char* name = "Shenandoah");
!   MemoryUsage get_memory_usage() override;
!   size_t used_in_bytes() override;
+   size_t max_size() const override;
+ 
+ protected:
+   ShenandoahMemoryPool(ShenandoahHeap* heap,
+                        const char* name,
+                        size_t initial_capacity,
+                        size_t max_capacity);
+ };
+ 
+ class ShenandoahGenerationalMemoryPool: public ShenandoahMemoryPool {
+ private:
+   ShenandoahGeneration* _generation;
+ public:
+   explicit ShenandoahGenerationalMemoryPool(ShenandoahHeap* heap, const char* name, ShenandoahGeneration* generation);
+   MemoryUsage get_memory_usage() override;
+   size_t used_in_bytes() override;
+   size_t max_size() const override;
+ };
+ 
+ class ShenandoahYoungGenMemoryPool : public ShenandoahGenerationalMemoryPool {
+ public:
+   explicit ShenandoahYoungGenMemoryPool(ShenandoahHeap* heap);
+ };
+ 
+ class ShenandoahOldGenMemoryPool : public ShenandoahGenerationalMemoryPool {
+ public:
+   explicit ShenandoahOldGenMemoryPool(ShenandoahHeap* heap);
  };
  
  #endif // SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP