src/hotspot/share/gc/g1/g1SurvivorRegions.cpp

rev 56461 : imported patch 8220312.stat.2
rev 56462 : imported patch 8220312.stat.3
rev 56463 : [mq]: 8220312.stat.4

@@ -21,28 +21,35 @@
  * questions.
  *
  */
 
 #include "precompiled.hpp"
+#include "gc/g1/g1RegionCounts.hpp"
 #include "gc/g1/g1SurvivorRegions.hpp"
 #include "gc/g1/heapRegion.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/debug.hpp"
 
 G1SurvivorRegions::G1SurvivorRegions() :
   _regions(new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapRegion*>(8, true, mtGC)),
-  _used_bytes(0) {}
+  _used_bytes(0),
+  _region_counts() {}
 
-void G1SurvivorRegions::add(HeapRegion* hr) {
+uint G1SurvivorRegions::add(HeapRegion* hr) {
   assert(hr->is_survivor(), "should be flagged as survivor region");
   _regions->append(hr);
+  return _region_counts.add(hr);
 }
 
 uint G1SurvivorRegions::length() const {
   return (uint)_regions->length();
 }
 
+uint G1SurvivorRegions::length(uint node_index) const {
+  return _region_counts.length(node_index);
+}
+
 void G1SurvivorRegions::convert_to_eden() {
   for (GrowableArrayIterator<HeapRegion*> it = _regions->begin();
        it != _regions->end();
        ++it) {
     HeapRegion* hr = *it;

@@ -52,10 +59,11 @@
 }
 
 void G1SurvivorRegions::clear() {
   _regions->clear();
   _used_bytes = 0;
+  _region_counts.clear();
 }
 
 void G1SurvivorRegions::add_used_bytes(size_t used_bytes) {
   _used_bytes += used_bytes;
 }