src/share/vm/services/memoryService.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2013, 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) 2003, 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.
*** 75,103 ****
  
    static MemoryPool*                    _metaspace_pool;
    static MemoryPool*                    _compressed_class_pool;
  
    static void add_generation_memory_pool(Generation* gen,
!                                          MemoryManager* major_mgr,
!                                          MemoryManager* minor_mgr);
    static void add_generation_memory_pool(Generation* gen,
!                                          MemoryManager* major_mgr) {
      add_generation_memory_pool(gen, major_mgr, NULL);
    }
  
  
    static void add_psYoung_memory_pool(PSYoungGen* gen,
!                                       MemoryManager* major_mgr,
!                                       MemoryManager* minor_mgr);
    static void add_psOld_memory_pool(PSOldGen* gen,
!                                     MemoryManager* mgr);
  
    static void add_g1YoungGen_memory_pool(G1CollectedHeap* g1h,
!                                          MemoryManager* major_mgr,
!                                          MemoryManager* minor_mgr);
    static void add_g1OldGen_memory_pool(G1CollectedHeap* g1h,
!                                        MemoryManager* mgr);
  
    static MemoryPool* add_space(ContiguousSpace* space,
                                 const char* name,
                                 bool is_heap,
                                 size_t max_size,
--- 75,104 ----
  
    static MemoryPool*                    _metaspace_pool;
    static MemoryPool*                    _compressed_class_pool;
  
    static void add_generation_memory_pool(Generation* gen,
!                                          GCMemoryManager* major_mgr,
!                                          GCMemoryManager* minor_mgr);
    static void add_generation_memory_pool(Generation* gen,
!                                          GCMemoryManager* major_mgr) {
      add_generation_memory_pool(gen, major_mgr, NULL);
    }
  
  
    static void add_psYoung_memory_pool(PSYoungGen* gen,
!                                       GCMemoryManager* major_mgr,
!                                       GCMemoryManager* minor_mgr);
    static void add_psOld_memory_pool(PSOldGen* gen,
!                                     GCMemoryManager* mgr);
  
    static void add_g1YoungGen_memory_pool(G1CollectedHeap* g1h,
!                                          GCMemoryManager* major_mgr,
!                                          GCMemoryManager* minor_mgr);
    static void add_g1OldGen_memory_pool(G1CollectedHeap* g1h,
!                                        GCMemoryManager* major_mgr,
!                                        GCMemoryManager* minor_mgr);
  
    static MemoryPool* add_space(ContiguousSpace* space,
                                 const char* name,
                                 bool is_heap,
                                 size_t max_size,
*** 160,170 ****
                         bool recordAccumulatedGCTime,
                         bool recordPreGCUsage, bool recordPeakUsage);
    static void gc_end(bool fullGC, bool recordPostGCUsage,
                       bool recordAccumulatedGCTime,
                       bool recordGCEndTime, bool countCollection,
!                      GCCause::Cause cause);
  
  
    static void oops_do(OopClosure* f);
  
    static bool get_verbose() { return PrintGC; }
--- 161,172 ----
                         bool recordAccumulatedGCTime,
                         bool recordPreGCUsage, bool recordPeakUsage);
    static void gc_end(bool fullGC, bool recordPostGCUsage,
                       bool recordAccumulatedGCTime,
                       bool recordGCEndTime, bool countCollection,
!                      GCCause::Cause cause,
!                      bool allMemoryPoolsAffected);
  
  
    static void oops_do(OopClosure* f);
  
    static bool get_verbose() { return PrintGC; }
*** 183,192 ****
--- 185,195 ----
  };
  
  class TraceMemoryManagerStats : public StackObj {
  private:
    bool         _fullGC;
+   bool         _allMemoryPoolsAffected;
    bool         _recordGCBeginTime;
    bool         _recordPreGCUsage;
    bool         _recordPeakUsage;
    bool         _recordPostGCUsage;
    bool         _recordAccumulatedGCTime;
*** 195,214 ****
--- 198,219 ----
    GCCause::Cause _cause;
  public:
    TraceMemoryManagerStats() {}
    TraceMemoryManagerStats(bool fullGC,
                            GCCause::Cause cause,
+                           bool allMemoryPoolsAffected = true,
                            bool recordGCBeginTime = true,
                            bool recordPreGCUsage = true,
                            bool recordPeakUsage = true,
                            bool recordPostGCUsage = true,
                            bool recordAccumulatedGCTime = true,
                            bool recordGCEndTime = true,
                            bool countCollection = true);
  
    void initialize(bool fullGC,
                    GCCause::Cause cause,
+                   bool allMemoryPoolsAffected,
                    bool recordGCBeginTime,
                    bool recordPreGCUsage,
                    bool recordPeakUsage,
                    bool recordPostGCUsage,
                    bool recordAccumulatedGCTime,