src/hotspot/share/services/memoryService.hpp

rev 48000 : [mq]: open.patch
rev 48001 : [mq]: 8191564-new.patch

@@ -94,14 +94,14 @@
   static void track_compressed_class_memory_usage() {
     track_memory_pool_usage(_compressed_class_pool);
   }
   static void track_memory_pool_usage(MemoryPool* pool);
 
-  static void gc_begin(GCMemoryManager* mgr, bool recordGCBeginTime,
+  static void gc_begin(GCMemoryManager* manager, bool recordGCBeginTime,
                        bool recordAccumulatedGCTime,
                        bool recordPreGCUsage, bool recordPeakUsage);
-  static void gc_end(GCMemoryManager* mgr, bool recordPostGCUsage,
+  static void gc_end(GCMemoryManager* manager, bool recordPostGCUsage,
                      bool recordAccumulatedGCTime,
                      bool recordGCEndTime, bool countCollection,
                      GCCause::Cause cause);
 
   static void oops_do(OopClosure* f);

@@ -113,32 +113,32 @@
   static Handle create_MemoryUsage_obj(MemoryUsage usage, TRAPS);
 };
 
 class TraceMemoryManagerStats : public StackObj {
 private:
-  GCMemoryManager* _gc_mem_mgr;
+  GCMemoryManager* _gc_memory_manager;
   bool         _recordGCBeginTime;
   bool         _recordPreGCUsage;
   bool         _recordPeakUsage;
   bool         _recordPostGCUsage;
   bool         _recordAccumulatedGCTime;
   bool         _recordGCEndTime;
   bool         _countCollection;
   GCCause::Cause _cause;
 public:
   TraceMemoryManagerStats() {}
-  TraceMemoryManagerStats(GCMemoryManager* gc_mem_mgr,
+  TraceMemoryManagerStats(GCMemoryManager* gc_memory_manager,
                           GCCause::Cause cause,
                           bool recordGCBeginTime = true,
                           bool recordPreGCUsage = true,
                           bool recordPeakUsage = true,
                           bool recordPostGCUsage = true,
                           bool recordAccumulatedGCTime = true,
                           bool recordGCEndTime = true,
                           bool countCollection = true);
 
-  void initialize(GCMemoryManager* gc_mem_mgr,
+  void initialize(GCMemoryManager* gc_memory_manager,
                   GCCause::Cause cause,
                   bool recordGCBeginTime,
                   bool recordPreGCUsage,
                   bool recordPeakUsage,
                   bool recordPostGCUsage,