src/hotspot/share/gc/z/zStat.hpp

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, 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.

@@ -34,10 +34,11 @@
 #include "utilities/numberSeq.hpp"
 #include "utilities/ticks.hpp"
 
 class ZPage;
 class ZRelocationSetSelectorGroupStats;
+class ZRelocationSetSelectorStats;
 class ZStatSampler;
 class ZStatSamplerHistory;
 struct ZStatCounterData;
 struct ZStatSamplerData;
 

@@ -417,29 +418,17 @@
 //
 // Stat relocation
 //
 class ZStatRelocation : public AllStatic {
 private:
-  struct Group {
-    size_t _npages;
-    size_t _total;
-    size_t _empty;
-    size_t _compacting_from;
-    size_t _compacting_to;
-  };
-
-  static Group _small;
-  static Group _medium;
-  static Group _large;
-  static bool  _success;
-
-  static void print(const char* name, const ZStatRelocation::Group& group);
-
-public:
-  static void set_at_select_relocation_set(const ZRelocationSetSelectorGroupStats& small,
-                                           const ZRelocationSetSelectorGroupStats& medium,
-                                           const ZRelocationSetSelectorGroupStats& large);
+  static ZRelocationSetSelectorStats _stats;
+  static bool                        _success;
+
+  static void print(const char* name, const ZRelocationSetSelectorGroupStats& group);
+
+public:
+  static void set_at_select_relocation_set(const ZRelocationSetSelectorStats& stats);
   static void set_at_relocate_end(bool success);
 
   static void print();
 };
 

@@ -553,13 +542,11 @@
                                 size_t capacity,
                                 size_t used);
   static void set_at_mark_end(size_t capacity,
                               size_t allocated,
                               size_t used);
-  static void set_at_select_relocation_set(const ZRelocationSetSelectorGroupStats& small,
-                                           const ZRelocationSetSelectorGroupStats& medium,
-                                           const ZRelocationSetSelectorGroupStats& large,
+  static void set_at_select_relocation_set(const ZRelocationSetSelectorStats& stats,
                                            size_t reclaimed);
   static void set_at_relocate_start(size_t capacity,
                                     size_t allocated,
                                     size_t used);
   static void set_at_relocate_end(size_t capacity,