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

rev 56449 : imported patch 8220310.mut.1
rev 56452 : [mq]: 8220310.mut.3-stefan
rev 56453 : [mq]: 8220310.mut.3-kim

*** 26,35 ****
--- 26,36 ----
  #include "code/nmethod.hpp"
  #include "gc/g1/g1BlockOffsetTable.inline.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1HeapRegionTraceType.hpp"
+ #include "gc/g1/g1MemoryNodeManager.hpp"
  #include "gc/g1/g1OopClosures.inline.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/g1/heapRegionBounds.inline.hpp"
  #include "gc/g1/heapRegionManager.inline.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
*** 246,256 ****
  #endif
      _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0),
      _index_in_opt_cset(InvalidCSetIndex), _young_index_in_cset(-1),
      _surv_rate_group(NULL), _age_index(-1),
      _prev_top_at_mark_start(NULL), _next_top_at_mark_start(NULL),
!     _recorded_rs_length(0), _predicted_elapsed_time_ms(0)
  {
    _rem_set = new HeapRegionRemSet(bot, this);
  
    initialize(mr);
  }
--- 247,258 ----
  #endif
      _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0),
      _index_in_opt_cset(InvalidCSetIndex), _young_index_in_cset(-1),
      _surv_rate_group(NULL), _age_index(-1),
      _prev_top_at_mark_start(NULL), _next_top_at_mark_start(NULL),
!     _recorded_rs_length(0), _predicted_elapsed_time_ms(0),
!     _node_index(G1MemoryNodeManager::UnknownNodeIndex)
  {
    _rem_set = new HeapRegionRemSet(bot, this);
  
    initialize(mr);
  }
*** 453,464 ****
    if (in_collection_set()) {
      st->print("|CS");
    } else {
      st->print("|  ");
    }
!   st->print_cr("|TAMS " PTR_FORMAT ", " PTR_FORMAT "| %s ",
                 p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()), rem_set()->get_state_str());
  }
  
  class G1VerificationClosure : public BasicOopIterateClosure {
  protected:
    G1CollectedHeap* _g1h;
--- 455,471 ----
    if (in_collection_set()) {
      st->print("|CS");
    } else {
      st->print("|  ");
    }
!   st->print("|TAMS " PTR_FORMAT ", " PTR_FORMAT "| %s ",
                 p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()), rem_set()->get_state_str());
+   if (UseNUMA) {
+     const int* node_ids = G1MemoryNodeManager::mgr()->node_ids();
+     st->print("|Node ID %02d", node_ids[this->node_index()]);
+   }
+   st->print_cr("");
  }
  
  class G1VerificationClosure : public BasicOopIterateClosure {
  protected:
    G1CollectedHeap* _g1h;