src/hotspot/share/gc/g1/g1CollectedHeap.hpp

rev 56821 : imported patch 8220310.mut.0
rev 56822 : imported patch 8220310.mut.1
rev 56823 : imported patch 8220310.mut.2
rev 56824 : imported patch 8220310.mut.3
rev 56825 : imported patch 8220310.mut.4
rev 56830 : imported patch 8220311.sur.2
rev 56834 : imported patch 8220312.stat.2
rev 56836 : imported patch 8220312.stat.4
rev 56838 : [mq]: 8220312.stat.5

*** 528,537 ****
--- 528,540 ----
    void make_pending_list_reachable();
  
    // Merges the information gathered on a per-thread basis for all worker threads
    // during GC into global variables.
    void merge_per_thread_state_info(G1ParScanThreadStateSet* per_thread_states);
+ 
+   void verify_numa_regions(const char* desc);
+ 
  public:
    G1YoungRemSetSamplingThread* sampling_thread() const { return _young_gen_sampling_thread; }
  
    WorkGang* workers() const { return _workers; }
  
*** 1282,1292 ****
--- 1285,1297 ----
    // add appropriate methods for any other surv rate groups
  
    const G1SurvivorRegions* survivor() const { return &_survivor; }
  
    uint eden_regions_count() const { return _eden.length(); }
+   uint eden_regions_count(uint node_index) const { return _eden.regions_on_node(node_index); }
    uint survivor_regions_count() const { return _survivor.length(); }
+   uint survivor_regions_count(uint node_index) const { return _survivor.regions_on_node(node_index); }
    size_t eden_regions_used_bytes() const { return _eden.used_bytes(); }
    size_t survivor_regions_used_bytes() const { return _survivor.used_bytes(); }
    uint young_regions_count() const { return _eden.length() + _survivor.length(); }
    uint old_regions_count() const { return _old_set.length(); }
    uint archive_regions_count() const { return _archive_set.length(); }