Merge
authorshurailine
Mon, 14 Jan 2019 08:23:50 -0800
changeset 53296 de5564099c01
parent 53295 520f8e2041bb (current diff)
parent 53294 fcddd67f986f (diff)
child 53297 d633be26e59b
Merge
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp	Mon Jan 14 08:22:49 2019 -0800
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp	Mon Jan 14 08:23:50 2019 -0800
@@ -33,46 +33,42 @@
 class GCPolicyCounters: public CHeapObj<mtGC> {
   friend class VMStructs;
 
-  private:
-
-    // Constant PerfData types don't need to retain a reference.
-    // However, it's a good idea to document them here.
-    // PerfStringConstant*     _name;
-    // PerfStringConstant*     _collector_size;
-    // PerfStringConstant*     _generation_size;
+  // Constant PerfData types don't need to retain a reference.
+  // However, it's a good idea to document them here.
+  // PerfStringConstant* _name;
+  // PerfStringConstant* _collector_size;
+  // PerfStringConstant* _generation_size;
 
-    PerfVariable*     _tenuring_threshold;
-    PerfVariable*     _desired_survivor_size;
+  PerfVariable* _tenuring_threshold;
+  PerfVariable* _desired_survivor_size;
 
-    const char* _name_space;
+  const char* _name_space;
 
- public:
-
+public:
   enum Name {
     NONE,
     GCPolicyCountersKind,
     GCAdaptivePolicyCountersKind,
-    PSGCAdaptivePolicyCountersKind,
-    CMSGCAdaptivePolicyCountersKind
+    PSGCAdaptivePolicyCountersKind
   };
 
   GCPolicyCounters(const char* name, int collectors, int generations);
 
-    inline PerfVariable* tenuring_threshold() const  {
-      return _tenuring_threshold;
-    }
+  inline PerfVariable* tenuring_threshold() const  {
+    return _tenuring_threshold;
+  }
 
-    inline PerfVariable* desired_survivor_size() const  {
-      return _desired_survivor_size;
-    }
+  inline PerfVariable* desired_survivor_size() const  {
+    return _desired_survivor_size;
+  }
 
-    const char* name_space() const { return _name_space; }
+  const char* name_space() const { return _name_space; }
 
-    virtual void update_counters() {}
+  virtual void update_counters() {}
 
-    virtual GCPolicyCounters::Name kind() const {
-      return GCPolicyCounters::GCPolicyCountersKind;
-    }
+  virtual GCPolicyCounters::Name kind() const {
+    return GCPolicyCounters::GCPolicyCountersKind;
+  }
 };
 
 #endif // SHARE_GC_SHARED_GCPOLICYCOUNTERS_HPP