src/hotspot/share/services/memoryService.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2017, 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.
*** 178,191 ****
  }
  
  void MemoryService::gc_end(GCMemoryManager* manager, bool recordPostGCUsage,
                             bool recordAccumulatedGCTime,
                             bool recordGCEndTime, bool countCollection,
!                            GCCause::Cause cause) {
    // register the GC end statistics and memory usage
    manager->gc_end(recordPostGCUsage, recordAccumulatedGCTime, recordGCEndTime,
!                   countCollection, cause);
  }
  
  void MemoryService::oops_do(OopClosure* f) {
    int i;
  
--- 178,192 ----
  }
  
  void MemoryService::gc_end(GCMemoryManager* manager, bool recordPostGCUsage,
                             bool recordAccumulatedGCTime,
                             bool recordGCEndTime, bool countCollection,
!                            GCCause::Cause cause,
!                            bool allMemoryPoolsAffected) {
    // register the GC end statistics and memory usage
    manager->gc_end(recordPostGCUsage, recordAccumulatedGCTime, recordGCEndTime,
!                   countCollection, cause, allMemoryPoolsAffected);
  }
  
  void MemoryService::oops_do(OopClosure* f) {
    int i;
  
*** 234,253 ****
    return obj;
  }
  
  TraceMemoryManagerStats::TraceMemoryManagerStats(GCMemoryManager* gc_memory_manager,
                                                   GCCause::Cause cause,
                                                   bool recordGCBeginTime,
                                                   bool recordPreGCUsage,
                                                   bool recordPeakUsage,
                                                   bool recordPostGCUsage,
                                                   bool recordAccumulatedGCTime,
                                                   bool recordGCEndTime,
                                                   bool countCollection) {
    initialize(gc_memory_manager, cause, recordGCBeginTime, recordPreGCUsage, recordPeakUsage,
               recordPostGCUsage, recordAccumulatedGCTime, recordGCEndTime,
!              countCollection);
  }
  
  // for a subclass to create then initialize an instance before invoking
  // the MemoryService
  void TraceMemoryManagerStats::initialize(GCMemoryManager* gc_memory_manager,
--- 235,255 ----
    return obj;
  }
  
  TraceMemoryManagerStats::TraceMemoryManagerStats(GCMemoryManager* gc_memory_manager,
                                                   GCCause::Cause cause,
+                                                  bool allMemoryPoolsAffected,
                                                   bool recordGCBeginTime,
                                                   bool recordPreGCUsage,
                                                   bool recordPeakUsage,
                                                   bool recordPostGCUsage,
                                                   bool recordAccumulatedGCTime,
                                                   bool recordGCEndTime,
                                                   bool countCollection) {
    initialize(gc_memory_manager, cause, recordGCBeginTime, recordPreGCUsage, recordPeakUsage,
               recordPostGCUsage, recordAccumulatedGCTime, recordGCEndTime,
!              countCollection, allMemoryPoolsAffected);
  }
  
  // for a subclass to create then initialize an instance before invoking
  // the MemoryService
  void TraceMemoryManagerStats::initialize(GCMemoryManager* gc_memory_manager,
*** 256,267 ****
                                           bool recordPreGCUsage,
                                           bool recordPeakUsage,
                                           bool recordPostGCUsage,
                                           bool recordAccumulatedGCTime,
                                           bool recordGCEndTime,
!                                          bool countCollection) {
    _gc_memory_manager = gc_memory_manager;
    _recordGCBeginTime = recordGCBeginTime;
    _recordPreGCUsage = recordPreGCUsage;
    _recordPeakUsage = recordPeakUsage;
    _recordPostGCUsage = recordPostGCUsage;
    _recordAccumulatedGCTime = recordAccumulatedGCTime;
--- 258,271 ----
                                           bool recordPreGCUsage,
                                           bool recordPeakUsage,
                                           bool recordPostGCUsage,
                                           bool recordAccumulatedGCTime,
                                           bool recordGCEndTime,
!                                          bool countCollection,
!                                          bool allMemoryPoolsAffected) {
    _gc_memory_manager = gc_memory_manager;
+   _allMemoryPoolsAffected = allMemoryPoolsAffected;
    _recordGCBeginTime = recordGCBeginTime;
    _recordPreGCUsage = recordPreGCUsage;
    _recordPeakUsage = recordPeakUsage;
    _recordPostGCUsage = recordPostGCUsage;
    _recordAccumulatedGCTime = recordAccumulatedGCTime;
*** 273,279 ****
                            _recordPreGCUsage, _recordPeakUsage);
  }
  
  TraceMemoryManagerStats::~TraceMemoryManagerStats() {
    MemoryService::gc_end(_gc_memory_manager, _recordPostGCUsage, _recordAccumulatedGCTime,
!                         _recordGCEndTime, _countCollection, _cause);
  }
--- 277,283 ----
                            _recordPreGCUsage, _recordPeakUsage);
  }
  
  TraceMemoryManagerStats::~TraceMemoryManagerStats() {
    MemoryService::gc_end(_gc_memory_manager, _recordPostGCUsage, _recordAccumulatedGCTime,
!                         _recordGCEndTime, _countCollection, _cause, _allMemoryPoolsAffected);
  }