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

rev 10464 : imported patch 8151126-clean-up-duplicate-code-for-clearing-bitmaps
rev 10465 : [mq]: 8151614-improve-concurrent-mark-logging

*** 606,627 ****
    void checkpointRootsInitialPre();
    void checkpointRootsInitialPost();
  
    // Scan all the root regions and mark everything reachable from
    // them.
!   void scanRootRegions();
  
    // Scan a single root region and mark everything reachable from it.
    void scanRootRegion(HeapRegion* hr, uint worker_id);
  
    // Do concurrent phase of marking, to a tentative transitive closure.
!   void markFromRoots();
  
    void checkpointRootsFinal(bool clear_all_soft_refs);
    void checkpointRootsFinalWork();
    void cleanup();
!   void completeCleanup();
  
    // Mark in the previous bitmap.  NB: this is usually read-only, so use
    // this carefully!
    inline void markPrev(oop p);
  
--- 606,627 ----
    void checkpointRootsInitialPre();
    void checkpointRootsInitialPost();
  
    // Scan all the root regions and mark everything reachable from
    // them.
!   void scan_root_regions();
  
    // Scan a single root region and mark everything reachable from it.
    void scanRootRegion(HeapRegion* hr, uint worker_id);
  
    // Do concurrent phase of marking, to a tentative transitive closure.
!   void mark_from_roots();
  
    void checkpointRootsFinal(bool clear_all_soft_refs);
    void checkpointRootsFinalWork();
    void cleanup();
!   void complete_cleanup();
  
    // Mark in the previous bitmap.  NB: this is usually read-only, so use
    // this carefully!
    inline void markPrev(oop p);