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

rev 60594 : [mq]: 8240556-abort-conc-mark-new

*** 28,43 ****
--- 28,45 ----
  #include "gc/g1/g1ConcurrentMarkBitMap.hpp"
  #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
  #include "gc/g1/g1HeapVerifier.hpp"
  #include "gc/g1/g1RegionMarkStatsCache.hpp"
  #include "gc/g1/heapRegionSet.hpp"
+ #include "gc/shared/gcCause.hpp"
  #include "gc/shared/taskTerminator.hpp"
  #include "gc/shared/taskqueue.hpp"
  #include "gc/shared/verifyOption.hpp"
  #include "gc/shared/workgroup.hpp"
  #include "memory/allocation.hpp"
  #include "utilities/compilerWarnings.hpp"
+ #include "utilities/numberSeq.hpp"
  
  class ConcurrentGCTimer;
  class G1ConcurrentMarkThread;
  class G1CollectedHeap;
  class G1CMOopClosure;
*** 540,551 ****
    // Clear the previous marking bitmap during safepoint.
    void clear_prev_bitmap(WorkGang* workers);
  
    // These two methods do the work that needs to be done at the start and end of the
    // concurrent start pause.
!   void pre_concurrent_start();
!   void post_concurrent_start();
  
    // Scan all the root regions and mark everything reachable from
    // them.
    void scan_root_regions();
  
--- 542,553 ----
    // Clear the previous marking bitmap during safepoint.
    void clear_prev_bitmap(WorkGang* workers);
  
    // These two methods do the work that needs to be done at the start and end of the
    // concurrent start pause.
!   void pre_concurrent_start(GCCause::Cause cause);
!   void post_concurrent_start(bool is_mark_cycle);
  
    // Scan all the root regions and mark everything reachable from
    // them.
    void scan_root_regions();
  
*** 592,602 ****
    inline bool mark_in_next_bitmap(uint worker_id, oop const obj);
  
    inline bool is_marked_in_next_bitmap(oop p) const;
  
    ConcurrentGCTimer* gc_timer_cm() const { return _gc_timer_cm; }
-   G1OldTracer* gc_tracer_cm() const { return _gc_tracer_cm; }
  
  private:
    // Rebuilds the remembered sets for chosen regions in parallel and concurrently to the application.
    void rebuild_rem_set_concurrently();
  };
--- 594,603 ----