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

rev 56834 : imported patch 8220312.stat.2
rev 56836 : imported patch 8220312.stat.4
rev 56838 : [mq]: 8220312.stat.5

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2019, 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.
*** 22,31 ****
--- 22,32 ----
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
+ #include "gc/g1/g1NUMA.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/g1/heapRegionSet.inline.hpp"
  
  uint FreeRegionList::_unrealistically_long_length = 0;
  
*** 99,108 ****
--- 100,112 ----
  
      HeapRegion* next = curr->next();
      curr->set_next(NULL);
      curr->set_prev(NULL);
      curr->set_containing_set(NULL);
+ 
+     decrease_length(curr->node_index());
+ 
      curr = next;
    }
    clear();
  
    verify_optional();
*** 117,126 ****
--- 121,134 ----
  
    if (from_list->is_empty()) {
      return;
    }
  
+   if (_node_info != NULL && from_list->_node_info != NULL) {
+     _node_info->add(from_list->_node_info);
+   }
+ 
    #ifdef ASSERT
    FreeRegionListIterator iter(from_list);
    while (iter.more_available()) {
      HeapRegion* hr = iter.get_next();
      // In set_containing_set() we check that we either set the value
*** 218,227 ****
--- 226,238 ----
      curr->set_next(NULL);
      curr->set_prev(NULL);
      remove(curr);
  
      count++;
+ 
+     decrease_length(curr->node_index());
+ 
      curr = next;
    }
  
    assert(count == num_regions,
           "[%s] count: %u should be == num_regions: %u",
*** 265,274 ****
--- 276,289 ----
  void FreeRegionList::clear() {
    _length = 0;
    _head = NULL;
    _tail = NULL;
    _last = NULL;
+ 
+   if (_node_info!= NULL) {
+     _node_info->clear();
+   }
  }
  
  void FreeRegionList::verify_list() {
    HeapRegion* curr = _head;
    HeapRegion* prev1 = NULL;
*** 301,305 ****
--- 316,358 ----
  
    guarantee(_tail == prev0, "Expected %s to end with %u but it ended with %u.", name(), _tail->hrm_index(), prev0->hrm_index());
    guarantee(_tail == NULL || _tail->next() == NULL, "_tail should not have a next");
    guarantee(length() == count, "%s count mismatch. Expected %u, actual %u.", name(), length(), count);
  }
+ 
+ 
+ FreeRegionList::FreeRegionList(const char* name, HeapRegionSetChecker* checker):
+   HeapRegionSetBase(name, checker),
+   _node_info(G1NUMA::numa()->is_enabled() ? new NodeInfo() : NULL) {
+ 
+   clear();
+ }
+ 
+ FreeRegionList::~FreeRegionList() {
+   if (_node_info != NULL) {
+     delete _node_info;
+   }
+ }
+ 
+ FreeRegionList::NodeInfo::NodeInfo() : _numa(G1NUMA::numa()), _length_of_node(NULL),
+                                        _num_nodes(_numa->num_active_nodes()) {
+   assert(UseNUMA, "Invariant");
+ 
+   _length_of_node = NEW_C_HEAP_ARRAY(uint, _num_nodes, mtGC);
+ }
+ 
+ FreeRegionList::NodeInfo::~NodeInfo() {
+   FREE_C_HEAP_ARRAY(uint, _length_of_node);
+ }
+ 
+ void FreeRegionList::NodeInfo::clear() {
+   for (uint i = 0; i < _num_nodes; ++i) {
+     _length_of_node[i] = 0;
+   }
+ }
+ 
+ void FreeRegionList::NodeInfo::add(NodeInfo* info) {
+   for (uint i = 0; i < _num_nodes; ++i) {
+     _length_of_node[i] += info->_length_of_node[i];
+   }
+ }
+