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

rev 53920 : [mq]: 8218880-g1-crashes-periodic-gc-gclocker
rev 53923 : [mq]: 8219747-remove-g1-prefix

*** 364,374 ****
    STWGCTimer* _gc_timer_stw;
  
    G1NewTracer* _gc_tracer_stw;
  
    // The current policy object for the collector.
!   G1Policy* _g1_policy;
    G1HeapSizingPolicy* _heap_sizing_policy;
  
    G1CollectionSet _collection_set;
  
    // Try to allocate a single non-humongous HeapRegion sufficient for
--- 364,374 ----
    STWGCTimer* _gc_timer_stw;
  
    G1NewTracer* _gc_tracer_stw;
  
    // The current policy object for the collector.
!   G1Policy* _policy;
    G1HeapSizingPolicy* _heap_sizing_policy;
  
    G1CollectionSet _collection_set;
  
    // Try to allocate a single non-humongous HeapRegion sufficient for
*** 743,753 ****
  
    // The hot card cache for remembered set insertion optimization.
    G1HotCardCache* _hot_card_cache;
  
    // The g1 remembered set of the heap.
!   G1RemSet* _g1_rem_set;
  
    // A set of cards that cover the objects for which the Rsets should be updated
    // concurrently after the collection.
    G1DirtyCardQueueSet _dirty_card_queue_set;
  
--- 743,753 ----
  
    // The hot card cache for remembered set insertion optimization.
    G1HotCardCache* _hot_card_cache;
  
    // The g1 remembered set of the heap.
!   G1RemSet* _rem_set;
  
    // A set of cards that cover the objects for which the Rsets should be updated
    // concurrently after the collection.
    G1DirtyCardQueueSet _dirty_card_queue_set;
  
*** 948,977 ****
  
    const G1CollectorState* collector_state() const { return &_collector_state; }
    G1CollectorState* collector_state() { return &_collector_state; }
  
    // The current policy object for the collector.
!   G1Policy* g1_policy() const { return _g1_policy; }
  
    HeapRegionManager* hrm() const { return _hrm; }
  
    const G1CollectionSet* collection_set() const { return &_collection_set; }
    G1CollectionSet* collection_set() { return &_collection_set; }
  
    virtual CollectorPolicy* collector_policy() const;
-   virtual G1CollectorPolicy* g1_collector_policy() const;
  
    virtual SoftRefPolicy* soft_ref_policy();
  
    virtual void initialize_serviceability();
    virtual MemoryUsage memory_usage();
    virtual GrowableArray<GCMemoryManager*> memory_managers();
    virtual GrowableArray<MemoryPool*> memory_pools();
  
-   // The rem set and barrier set.
-   G1RemSet* g1_rem_set() const { return _g1_rem_set; }
- 
    // Try to minimize the remembered set.
    void scrub_rem_set();
  
    // Apply the given closure on all cards in the Hot Card Cache, emptying it.
    void iterate_hcc_closure(G1CardTableEntryClosure* cl, uint worker_i);
--- 948,975 ----
  
    const G1CollectorState* collector_state() const { return &_collector_state; }
    G1CollectorState* collector_state() { return &_collector_state; }
  
    // The current policy object for the collector.
!   G1Policy* policy() const { return _policy; }
!   // The remembered set.
!   G1RemSet* rem_set() const { return _rem_set; }
  
    HeapRegionManager* hrm() const { return _hrm; }
  
    const G1CollectionSet* collection_set() const { return &_collection_set; }
    G1CollectionSet* collection_set() { return &_collection_set; }
  
    virtual CollectorPolicy* collector_policy() const;
  
    virtual SoftRefPolicy* soft_ref_policy();
  
    virtual void initialize_serviceability();
    virtual MemoryUsage memory_usage();
    virtual GrowableArray<GCMemoryManager*> memory_managers();
    virtual GrowableArray<MemoryPool*> memory_pools();
  
    // Try to minimize the remembered set.
    void scrub_rem_set();
  
    // Apply the given closure on all cards in the Hot Card Cache, emptying it.
    void iterate_hcc_closure(G1CardTableEntryClosure* cl, uint worker_i);
*** 1364,1373 ****
--- 1362,1372 ----
    void verify(VerifyOption vo);
  
    // WhiteBox testing support.
    virtual bool supports_concurrent_phase_control() const;
    virtual bool request_concurrent_phase(const char* phase);
+   bool is_heap_heterogeneous() const;
  
    virtual WorkGang* get_safepoint_workers() { return _workers; }
  
    // The methods below are here for convenience and dispatch the
    // appropriate method depending on value of the given VerifyOption